From ad34f231a4b2523bbf72912666437699ed815cdc Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Fri, 5 Aug 2022 10:52:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85-=E7=9B=B8=E5=85=B3=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E5=90=8D=E5=8D=95-bug:=E5=8B=BE=E9=80=89=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E7=BC=BA=E5=A4=B1=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/ProjectRelatedPersonnelMapper.xml |  9 ++++-----
 .../impl/ProjectRelatedPersonnelServiceImpl.java | 16 +++++++---------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml
index 8c097fef3..107fe1a72 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml
@@ -60,13 +60,12 @@
     </select>
 
     <select id="queryById" resultType="com.jero.modules.project.entity.ProjectRelatedPersonnel">
-        SELECT
-        <include refid="select_item"/>
+        SELECT *
         FROM
-        project_related_personnel AS prp
+        project_related_personnel
         <where>
-            prp.id=#{id}
+            id=#{id}
         </where>
-        order by prp.create_time desc
+        order by create_time desc
     </select>
 </mapper>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
index 8f2136160..12b491960 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
@@ -34,14 +34,7 @@ import org.apache.poi.hssf.usermodel.HSSFRichTextString;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.VerticalAlignment;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
+import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -475,8 +468,9 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 			if (id.contains(",")) {//多个id
 				List<String> idList = Arrays.asList(id.split(","));
 				QueryWrapper<ProjectRelatedPersonnel> queryWrapper = new QueryWrapper<>();
-				queryWrapper.in("id",idList);
+				queryWrapper.lambda().in(ProjectRelatedPersonnel::getId, idList);
 				records = list(queryWrapper);
+				disposeData(records);
 
 			} else {//1个id
 				records = queryById(id);
@@ -486,8 +480,12 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 		}
 		//id无值,传全部
 		disposeDutyTerritory(records,cut);
+		records = records.stream()
+				.sorted(Comparator.comparing(ProjectRelatedPersonnel::getDutyTerritory))
+				.collect(Collectors.toList());
 		return records;
 	}
+
 	public void disposeDutyTerritory(List<ProjectRelatedPersonnel> records,String cut) {
 		//查标签内容里的责任领域数据
 		List<SysDictItem> sysDictItemValueList = sysDictItemMapper.selectItemsByDictCode(DictCodeEnum.DUTY_TERRITORY.getValue());