From 5d1ada4f57b77067cb3a58d8a38858ba73982a48 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 30 六月 2023 13:52:55 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo into yingxh
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceExternalpersonServiceImpl.java | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceExternalpersonServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceExternalpersonServiceImpl.java
index 4c570f4..34e9fe3 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceExternalpersonServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceExternalpersonServiceImpl.java
@@ -1,21 +1,20 @@
package com.ruoyi.project.service.impl;
-import java.util.List;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.project.domain.ServiceDonateorgan;
-import com.ruoyi.project.domain.vo.OrgansOfHospital;
-import com.ruoyi.project.domain.vo.reportInfo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import java.util.ArrayList;
-import java.util.Map;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.project.mapper.ServiceExternalpersonMapper;
import com.ruoyi.project.domain.ServiceExternalperson;
+import com.ruoyi.project.domain.vo.reportInfo;
+import com.ruoyi.project.mapper.ServiceExternalpersonMapper;
import com.ruoyi.project.service.IServiceExternalpersonService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
/**
* 澶栧洿鍗曚綅浜哄憳Service涓氬姟灞傚鐞�
@@ -49,7 +48,16 @@
if (StringUtils.isNotBlank(serviceExternalperson.getUsertype())){
wrappers.eq(ServiceExternalperson::getUsertype ,serviceExternalperson.getUsertype());
}
- return this.list(wrappers);
+ //return this.list(wrappers);
+ List<ServiceExternalperson> list = this.list(wrappers);
+
+ Collections.sort(list, new Comparator<ServiceExternalperson>() {
+ @Override
+ public int compare(ServiceExternalperson o1, ServiceExternalperson o2) {
+ return o1.getUserno().compareTo(o2.getUserno());
+ }
+ });
+ return list;
}
@Override
--
Gitblit v1.9.3