From a916236a2b84cc26e021795355a2e23c5ce00ae5 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Thu, 29 Dec 2022 13:45:42 +0800
Subject: [PATCH] =?UTF-8?q?64493=20=E7=BC=96=E8=BE=91=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=BA=93=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProjectLibraryBaseServiceImpl.java   | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index 2a9df4dad..45e9778aa 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -438,18 +438,20 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		}
 		//选择了其他工程师
 		if(StringUtils.isNotBlank(certificationEngineer)){
-			for (String id : original.getCertificationEngineer().split(",")) {
-				if (!certificationEngineer.contains(id)) {
-					//如果原来的认证工程师被删除了，则需要同步删除当前项目的相关人员名单中该认证工程师权限
-					QueryWrapper<ProjectUserPermission> delWrapper = new QueryWrapper<>();
-					delWrapper.eq("project_id", projectLibraryBase.getId()).eq("user_id",id).
-							eq("belong", ProjectUserLocationEnum.PROJECT_DETAIL_RELEVANT_PERSONNEL_CERTIFICATION.getValue());
-					projectUserPermissionService.remove(delWrapper);
-					//如果原来的认证工程师被删除了，则需要同步删除当前项目的法规清单中该认证工程师权限
-					QueryWrapper<ProjectUserPermission> delLawInventoryWrapper = new QueryWrapper<>();
-					delLawInventoryWrapper.eq("project_id", projectLibraryBase.getId()).eq("user_id",id).
-							eq("belong", ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_HOMOLOGATION.getValue());
-					projectUserPermissionService.remove(delLawInventoryWrapper);
+			if(StringUtils.isNotEmpty(original.getCertificationEngineer())){
+				for (String id : original.getCertificationEngineer().split(",")) {
+					if (!certificationEngineer.contains(id)) {
+						//如果原来的认证工程师被删除了，则需要同步删除当前项目的相关人员名单中该认证工程师权限
+						QueryWrapper<ProjectUserPermission> delWrapper = new QueryWrapper<>();
+						delWrapper.eq("project_id", projectLibraryBase.getId()).eq("user_id",id).
+								eq("belong", ProjectUserLocationEnum.PROJECT_DETAIL_RELEVANT_PERSONNEL_CERTIFICATION.getValue());
+						projectUserPermissionService.remove(delWrapper);
+						//如果原来的认证工程师被删除了，则需要同步删除当前项目的法规清单中该认证工程师权限
+						QueryWrapper<ProjectUserPermission> delLawInventoryWrapper = new QueryWrapper<>();
+						delLawInventoryWrapper.eq("project_id", projectLibraryBase.getId()).eq("user_id",id).
+								eq("belong", ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_HOMOLOGATION.getValue());
+						projectUserPermissionService.remove(delLawInventoryWrapper);
+					}
 				}
 			}