From e679550a6fa0321408570a73341054a81258cda9 Mon Sep 17 00:00:00 2001
From: zer0Black <lxtalx@gmail.com>
Date: Thu, 30 Jun 2022 14:58:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E7=85=A7=E8=B4=A3=E4=BB=BB=E9=A2=86?=
 =?UTF-8?q?=E5=9F=9F=E7=9A=84=E5=90=8D=E7=A7=B0=E8=BF=9B=E8=A1=8C=E4=BA=86?=
 =?UTF-8?q?=E6=AD=A3=E5=90=91=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/mapper/SysDictItemMapper.java      |  2 +-
 .../xml/ProjectRelatedPersonnelMapper.xml     |  2 +-
 .../ProjectRelatedPersonnelServiceImpl.java   | 35 +++++++++----------
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java
index 85b13dddd..98adef3ef 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java
@@ -23,7 +23,7 @@ public interface SysDictItemMapper extends BaseMapper<SysDictItem> {
     @Select("SELECT sys_dict_item.* FROM sys_dict_item LEFT JOIN sys_dict ON sys_dict_item.dict_id = sys_dict.id WHERE sys_dict_item.DEL_FLAG = 0 and DICT_CODE = #{dictCode} order by sort_order asc, item_value asc")
     public List<SysDictItem> selectItemsByDictCode(String dictCode);
 
-    @Select("SELECT sys_dict_item.* FROM sys_dict_item LEFT JOIN sys_dict ON sys_dict_item.dict_id = sys_dict.id WHERE DICT_CODE = #{dictCode} order by sys_dict_item.sort_order asc")
+    @Select("SELECT sys_dict_item.* FROM sys_dict_item LEFT JOIN sys_dict ON sys_dict_item.dict_id = sys_dict.id WHERE DICT_CODE = #{dictCode} order by sys_dict_item.item_text asc")
     public List<SysDictItem> selectItemsOrderBySortOrder(String dictCode);
 
     @Select("SELECT sys_dict.dict_code,sys_dict_item.* from sys_dict_item LEFT JOIN sys_dict ON sys_dict_item.dict_id = sys_dict.id where status = 1")
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 2ab452dd2..7bfe89213 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
@@ -44,7 +44,7 @@
             </if>
             AND sd.dict_code = #{dictCode}
         </where>
-        ORDER BY sdi.sort_order
+        ORDER BY sdi.item_text ASC
     </select>
 
     <select id="queryById" resultType="com.jero.modules.project.entity.ProjectRelatedPersonnel">
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 f5e8c7575..b9108ffba 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
@@ -1063,8 +1063,6 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 					}
 				}
 
-
-
 				if (CollectionUtils.isNotEmpty(certificationEngineerNameList) && StringUtils.isNotBlank(certificationEngineerNameList.get(0))) {
 					certificationEngineerNameList = certificationEngineerNameList.stream().distinct().collect(Collectors.toList());
 					certificationEngineerUsers=sysUserService.queryUserIdListByNameList(certificationEngineerNameList);
@@ -1139,28 +1137,29 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 		List<ProjectLibraryBase> baseDataList = projectLibraryBaseService.list(baseQueryWrapper.eq("id", projectId));
 		if (CollectionUtils.isNotEmpty(baseDataList)) {
 			String baseCertificationEngineer = baseDataList.get(0).getCertificationEngineer();
-			List<String> baseCertificationEngineerIdList = Arrays.asList(baseCertificationEngineer.split(","));
-			String certificationEngineerName;
-			QueryWrapper<SysUser> userqueryWrapper = new QueryWrapper<>();
-			userqueryWrapper.in("id ", baseCertificationEngineerIdList);
-			List<SysUser> userList = sysUserMapper.selectList(userqueryWrapper);
-			if (CollectionUtils.isNotEmpty(userList)) {
-				for (String baseUserId : baseCertificationEngineerIdList) {
+			// 判断是否有工程师
+			if (StringUtils.isNotEmpty(baseCertificationEngineer)){
+				List<String> baseCertificationEngineerIdList = Arrays.asList(baseCertificationEngineer.split(","));
+				String certificationEngineerName;
+				QueryWrapper<SysUser> userqueryWrapper = new QueryWrapper<>();
+				userqueryWrapper.in("id ", baseCertificationEngineerIdList);
+				List<SysUser> userList = sysUserMapper.selectList(userqueryWrapper);
+				if (CollectionUtils.isNotEmpty(userList)) {
+					for (String baseUserId : baseCertificationEngineerIdList) {
 
-					if (StringUtils.isNotEmpty(baseUserId)) {
-						certificationEngineerName = userList.stream().filter(e -> baseUserId.equals(e.getId()))
-								.map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(","));
-						ProjectRelatedPersonnel relatedPersonnel =new ProjectRelatedPersonnel();
-						relatedPersonnel.setCertificationEngineer(baseUserId);
-						relatedPersonnel.setCertificationEngineerName(certificationEngineerName);
-						certificationEngineerList.add(relatedPersonnel);
+						if (StringUtils.isNotEmpty(baseUserId)) {
+							certificationEngineerName = userList.stream().filter(e -> baseUserId.equals(e.getId()))
+									.map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(","));
+							ProjectRelatedPersonnel relatedPersonnel =new ProjectRelatedPersonnel();
+							relatedPersonnel.setCertificationEngineer(baseUserId);
+							relatedPersonnel.setCertificationEngineerName(certificationEngineerName);
+							certificationEngineerList.add(relatedPersonnel);
+						}
 					}
-
 				}
 			}
 		}
 
-
 		certificationEngineerList = certificationEngineerList.stream().distinct().collect(Collectors.toList());
 		return certificationEngineerList;