From 1c6a013cf2a082feafa14ad88f8dc1de74802235 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Sun, 14 Aug 2022 22:45:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86-=E8=A7=A3=E5=86=B3=E4=BA=BA=E5=91=98=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E5=A4=A7=E5=B0=8F=E5=86=99=E4=B8=8D=E4=B8=80=E8=87=B4?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParamsCollectManifestEOServiceImpl.java   | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index a54eedb2b..0bba80865 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -1063,10 +1063,15 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			studioList = projectLibraryBaseList.stream().map(ProjectLibraryBase::getStudioEngineerName).collect(Collectors.toList()); // studio 一个项目只有一个
 		}
 
-		if (CollectionUtil.isEmpty(userRoleIds) && !studioList.contains(loginUser.getUsername())
-				&& !homoList.contains(loginUser.getUsername())
-				&& !sdtList.contains(loginUser.getUsername())
-				&& !dreListOfPCM.contains(loginUser.getUsername())) {
+		String loginUserName = loginUser.getUsername().toLowerCase();
+		studioList = toLowerCaseOfList(studioList);
+		homoList = toLowerCaseOfList(homoList);
+		sdtList = toLowerCaseOfList(sdtList);
+		dreListOfPCM = toLowerCaseOfList(dreListOfPCM);
+		if (CollectionUtil.isEmpty(userRoleIds) && !studioList.contains(loginUserName)
+				&& !homoList.contains(loginUserName)
+				&& !sdtList.contains(loginUserName)
+				&& !dreListOfPCM.contains(loginUserName)) {
 
 			Map<String, String> map = new HashMap<>();
 			if (CutEnum.CN.getValue().equals(cut)) {
@@ -1079,7 +1084,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			return userTypeList;
 		}
 
-		if (homoList.contains(loginUser.getUsername())) {
+		if (homoList.contains(loginUserName)) {
 			Map<String, String> map = new HashMap<>();
 			if (CutEnum.CN.getValue().equals(cut)) {
 				map.put("label", CollectManifestUserTypeEnum.HOMO.getName());
@@ -1090,7 +1095,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			userTypeList.add(map);
 		}
 
-		if (sdtList.contains(loginUser.getUsername())) {
+		if (sdtList.contains(loginUserName)) {
 			Map<String, String> map = new HashMap<>();
 			if (CutEnum.CN.getValue().equals(cut)) {
 				map.put("label", CollectManifestUserTypeEnum.SDT.getName());
@@ -1101,7 +1106,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			userTypeList.add(map);
 		}
 
-		if (dreListOfPCM.contains(loginUser.getUsername())) {
+		if (dreListOfPCM.contains(loginUserName)) {
 			Map<String, String> map = new HashMap<>();
 			if (CutEnum.CN.getValue().equals(cut)) {
 				map.put("label", CollectManifestUserTypeEnum.DRE.getName());
@@ -1112,7 +1117,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			userTypeList.add(map);
 		}
 
-		if (studioList.contains(loginUser.getUsername())) {
+		if (studioList.contains(loginUserName)) {
 			Map<String, String> map = new HashMap<>();
 			if (CutEnum.CN.getValue().equals(cut)) {
 				map.put("label", CollectManifestUserTypeEnum.STUDIO.getName());
@@ -1140,6 +1145,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		return userTypeList;
 	}
 
+	private List<String> toLowerCaseOfList(List<String> list) {
+		List<String> newList = list;
+		if (CollectionUtil.isNotEmpty(list)) {
+			newList = list.stream().map(String::toLowerCase).collect(Collectors.toList());
+		}
+		return newList;
+	}
+
 	@Override
 	public Map<String, Object> isCollectFinished(String paramsManifestId) {
 		Map<String, Object> map = new HashMap<>();