From 4628439169b53d27c544c480c9d3bd86969044b0 Mon Sep 17 00:00:00 2001
From: zer0Black <lxtalx@gmail.com>
Date: Fri, 22 Jul 2022 15:15:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=9B=B8=E5=85=B3=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E5=90=8D=E5=8D=95=E5=AF=BC=E5=85=A5=E8=B4=A6=E5=8F=B7?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=86=99=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/modules/document/enums/SearchEnum.java   |  2 --
 .../impl/ProjectRelatedPersonnelServiceImpl.java  | 15 ++++-----------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/SearchEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/SearchEnum.java
index 279e77bcd..3b1ea5267 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/SearchEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/SearchEnum.java
@@ -12,8 +12,6 @@ public enum SearchEnum {
     FULL_TEXT_SEARCH_CN("全部中文","fulltextsearchcn"),
     FULL_TEXT_SEARCH_EN("全部英文","fulltextsearchen");
 
-
-
     String name;
     String value;
 
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 66e03ed80..8f2136160 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
@@ -55,14 +55,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeSet;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -1047,7 +1040,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 					StringBuilder midId = new StringBuilder();
 					for (String data : lawEngineerNameList) {
 						if (StringUtils.isNotEmpty(lawEngineerName)) {
-							lawEngineerId = lawEngineerUsers.stream().filter(e -> data.equals(e.getUsername()))
+							lawEngineerId = lawEngineerUsers.stream().filter(e -> data.toLowerCase().equals(e.getUsername().toLowerCase()))
 									.map(sysUser -> sysUser.getId()).collect(Collectors.joining(","));
 						}
 						midId.append(lawEngineerId).append(",");
@@ -1081,7 +1074,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 					StringBuilder midId = new StringBuilder();
 					for (String data : engineeringInterfacePersonNameList) {
 						if (StringUtils.isNotEmpty(engineeringInterfacePersonName)) {
-							engineeringInterfacePersonId = engineeringInterfacePersonUsers.stream().filter(e -> data.equals(e.getUsername()))
+							engineeringInterfacePersonId = engineeringInterfacePersonUsers.stream().filter(e -> data.toLowerCase().equals(e.getUsername().toLowerCase()))
 									.map(sysUser -> sysUser.getId()).collect(Collectors.joining(","));
 						}
 						midId.append(engineeringInterfacePersonId).append(",");
@@ -1130,7 +1123,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 					StringBuilder midId = new StringBuilder();
 					for (String data : certificationEngineerNameList) {
 						if (StringUtils.isNotEmpty(certificationEngineerName)) {
-							certificationEngineerId = certificationEngineerUsers.stream().filter(e -> data.equals(e.getUsername()))
+							certificationEngineerId = certificationEngineerUsers.stream().filter(e -> data.toLowerCase().equals(e.getUsername().toLowerCase()))
 									.map(sysUser -> sysUser.getId()).collect(Collectors.joining(","));
 						}
 						midId.append(certificationEngineerId).append(",");