From 819fe5ed08fd17b63687af195448f6e5bc49f3d8 Mon Sep 17 00:00:00 2001
From: CD <1103614279@qq.com>
Date: Mon, 14 Nov 2022 16:32:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=93=8D=E4=BD=9C+=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E6=95=B0=E6=8D=AE=E6=97=B6=E6=B7=BB=E5=8A=A0=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLawsInventoryEOServiceImpl.java    | 50 ++++++++++++++++++-
 .../ProjectRelatedPersonnelServiceImpl.java   | 14 +++++-
 2 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 3524c7c29..b1b7892f5 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -3184,6 +3184,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			List<ProjectLawsInventoryEO> infoList = list(queryWrapper.in("id", idList));
 
 			List<ProjectLawsInventoryEO> projectLawsInventoryEOList = new ArrayList<>();
+
+			List<ProjectUserPermission> adds = new ArrayList<>();
+			Date now = new Date();
 			for (String id : projectLawsInventoryEO.getIds().split(",")) {
 				ProjectLawsInventoryEO projectLawsInventoryEOTemp = new ProjectLawsInventoryEO();
 				projectLawsInventoryEOTemp.setId(id);
@@ -3227,46 +3230,57 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getVerifyDueDate())){
 					projectLawsInventoryEOTemp.setVerifyDueDate(projectLawsInventoryEO.getVerifyDueDate());
 				}
-
 				//================================批量设置人员===================================================
 				//法规工程师id
 				if(StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerId())){
 					projectLawsInventoryEOTemp.setRegulationOwnerId(projectLawsInventoryEO.getRegulationOwnerId());
+					setProjectLawsInventoryPermission(projectLawsInventoryEO.getRegulationOwnerId(),projectLibraryId, id, now, adds, ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_REGULATION.getValue());
 				}
 				//认证工程师id
 				if(StringUtils.isNotEmpty(projectLawsInventoryEO.getHomologationEngineerId())){
 					projectLawsInventoryEOTemp.setHomologationEngineerId(projectLawsInventoryEO.getHomologationEngineerId());
+					setProjectLawsInventoryPermission(projectLawsInventoryEO.getHomologationEngineerId(),projectLibraryId, id, now, adds, ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_HOMOLOGATION.getValue());
 				}
 				//工程接口人id
 				if(StringUtils.isNotEmpty(projectLawsInventoryEO.getEngineeringInterfacePerson())){
 					projectLawsInventoryEOTemp.setEngineeringInterfacePerson(projectLawsInventoryEO.getEngineeringInterfacePerson());
+					setProjectLawsInventoryPermission(projectLawsInventoryEO.getEngineeringInterfacePerson(),projectLibraryId, id, now, adds, ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_INTERFACE.getValue());
 				}
 				//设计符合性流程发起人id
 				if(StringUtils.isNotEmpty(projectLawsInventoryEO.getDesignInitiatorId())){
 					projectLawsInventoryEOTemp.setDesignInitiatorId(projectLawsInventoryEO.getDesignInitiatorId());
+					setProjectLawsInventoryPermission(projectLawsInventoryEO.getDesignInitiatorId(),projectLibraryId, id, now, adds, ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_DESIGN_INITIATOR.getValue());
 				}
 				//设计符合性流程责任人id
 				if(StringUtils.isNotEmpty(projectLawsInventoryEO.getDesignDutyId())){
 					projectLawsInventoryEOTemp.setDesignDutyId(projectLawsInventoryEO.getDesignDutyId());
+					setProjectLawsInventoryPermission(projectLawsInventoryEO.getDesignDutyId(),projectLibraryId, id, now, adds, ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_DESIGN_DUTY.getValue());
 				}
 				//Pre-homo确认流程发起人id
 				if(StringUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoInitiatorId())){
 					projectLawsInventoryEOTemp.setPrehomoInitiatorId(projectLawsInventoryEO.getPrehomoInitiatorId());
+					setProjectLawsInventoryPermission(projectLawsInventoryEO.getPrehomoInitiatorId(),projectLibraryId, id, now, adds, ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_PREHOMO_INITIATOR.getValue());
 				}
 				//Pre-homo确认责任人id
 				if(StringUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoDutyId())){
 					projectLawsInventoryEOTemp.setPrehomoDutyId(projectLawsInventoryEO.getPrehomoDutyId());
+					setProjectLawsInventoryPermission(projectLawsInventoryEO.getPrehomoDutyId(),projectLibraryId, id, now, adds, ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_PREHOMO_DUTY.getValue());
 				}
 				//验证符合性流程发起人id
 				if(StringUtils.isNotEmpty(projectLawsInventoryEO.getVerifyInitiatorId())){
 					projectLawsInventoryEOTemp.setVerifyInitiatorId(projectLawsInventoryEO.getVerifyInitiatorId());
+					setProjectLawsInventoryPermission(projectLawsInventoryEO.getVerifyInitiatorId(),projectLibraryId, id, now, adds, ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_VERIFY_INITIATOR.getValue());
 				}
 				//验证符合性流程责任人id
 				if(StringUtils.isNotEmpty(projectLawsInventoryEO.getVerifyDutyId())){
 					projectLawsInventoryEOTemp.setVerifyDutyId(projectLawsInventoryEO.getVerifyDutyId());
+					setProjectLawsInventoryPermission(projectLawsInventoryEO.getVerifyDutyId(),projectLibraryId, id, now, adds, ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_VERIFY_DUTY.getValue());
 				}
 				projectLawsInventoryEOList.add(projectLawsInventoryEOTemp);
 			}
+			if (ObjectUtils.isNotEmpty(adds)) {
+				projectUserPermissionService.saveBatch(adds);
+			}
 
 			this.updateBatchById(projectLawsInventoryEOList);
 
@@ -5510,6 +5524,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				this.saveBatch(dataList);
 				//项目任务清单数据初始化。
 				List<ProjectTaskInventoryEO> projectTaskInventoryEOList = new ArrayList<>();
+				//权限添加
+				List<ProjectUserPermission> adds = new ArrayList<>();
+				Date now = new Date();
 				for (ProjectLawsInventoryEO projectLawsInventoryEO : dataList) {
 					ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO();
 					String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", "");
@@ -5517,6 +5534,37 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					projectTaskInventoryEO.setProjectLawsInventoryId(projectLawsInventoryEO.getId());
 					projectLawsInventoryEO.setStandId(projectLawsInventoryEO.getStandId());
 					projectTaskInventoryEOList.add(projectTaskInventoryEO);
+					//设置权限
+					if (ObjectUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerId())) {
+						setProjectLawsInventoryPermission(projectLawsInventoryEO.getRegulationOwnerId(), projectLawsInventoryEOTemp.getProjectLibraryId(), projectLawsInventoryEO.getId(), now, adds, ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_REGULATION.getValue());
+					}
+					if (ObjectUtils.isNotEmpty(projectLawsInventoryEO.getHomologationEngineerId())) {
+						setProjectLawsInventoryPermission(projectLawsInventoryEO.getHomologationEngineerId(),projectLawsInventoryEOTemp.getProjectLibraryId(), projectLawsInventoryEO.getId(), now, adds, ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_HOMOLOGATION.getValue());
+					}
+					if (ObjectUtils.isNotEmpty(projectLawsInventoryEO.getEngineeringInterfacePerson())) {
+						setProjectLawsInventoryPermission(projectLawsInventoryEO.getEngineeringInterfacePerson(),projectLawsInventoryEOTemp.getProjectLibraryId(), projectLawsInventoryEO.getId(), now, adds, ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_INTERFACE.getValue());
+					}
+					if (ObjectUtils.isNotEmpty(projectLawsInventoryEO.getDesignInitiatorId())) {
+						setProjectLawsInventoryPermission(projectLawsInventoryEO.getDesignInitiatorId(),projectLawsInventoryEOTemp.getProjectLibraryId(), projectLawsInventoryEO.getId(), now, adds, ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_DESIGN_INITIATOR.getValue());
+					}
+					if (ObjectUtils.isNotEmpty(projectLawsInventoryEO.getDesignDutyId())) {
+						setProjectLawsInventoryPermission(projectLawsInventoryEO.getDesignDutyId(),projectLawsInventoryEOTemp.getProjectLibraryId(), projectLawsInventoryEO.getId(), now, adds, ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_DESIGN_DUTY.getValue());
+					}
+					if (ObjectUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoInitiatorId())) {
+						setProjectLawsInventoryPermission(projectLawsInventoryEO.getPrehomoInitiatorId(),projectLawsInventoryEOTemp.getProjectLibraryId(), projectLawsInventoryEO.getId(), now, adds, ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_PREHOMO_INITIATOR.getValue());
+					}
+					if (ObjectUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoDutyId())) {
+						setProjectLawsInventoryPermission(projectLawsInventoryEO.getPrehomoDutyId(),projectLawsInventoryEOTemp.getProjectLibraryId(), projectLawsInventoryEO.getId(), now, adds, ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_PREHOMO_DUTY.getValue());
+					}
+					if (ObjectUtils.isNotEmpty(projectLawsInventoryEO.getVerifyInitiatorId())) {
+						setProjectLawsInventoryPermission(projectLawsInventoryEO.getVerifyInitiatorId(),projectLawsInventoryEOTemp.getProjectLibraryId(), projectLawsInventoryEO.getId(), now, adds, ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_VERIFY_INITIATOR.getValue());
+					}
+					if (ObjectUtils.isNotEmpty(projectLawsInventoryEO.getVerifyDutyId())) {
+						setProjectLawsInventoryPermission(projectLawsInventoryEO.getVerifyDutyId(),projectLawsInventoryEOTemp.getProjectLibraryId(), projectLawsInventoryEO.getId(), now, adds, ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_VERIFY_DUTY.getValue());
+					}
+				}
+				if (ObjectUtils.isNotEmpty(adds)) {
+					projectUserPermissionService.saveBatch(adds);
 				}
 				this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList);
 				//初始化项目状态评估
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 0859081ac..8af315d1d 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
@@ -1070,6 +1070,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 	 */
 	@Override
 	public Result<?> oppositeDisposeData(List<ProjectRelatedPersonnel> records, String projectId, String cut) {
+		ProjectLibraryBase projectLibraryBase = projectLibraryBaseMapper.selectById(projectId);
 		//查询所有的用户
 		LambdaQueryWrapper<SysUser> wrapper = new LambdaQueryWrapper<>();
 		wrapper.select(SysUser::getUsername,SysUser::getId);
@@ -1342,7 +1343,6 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 
 			//用于权限对比
 			ProjectRelatedPersonnel original = baseMapper.selectById(projectRelatedPersonnel.getId());
-			ProjectLibraryBase projectLibraryBase = projectLibraryBaseMapper.selectById(projectId);
 
 			setLawsInventoryPermission(projectId, belongs, projectRelatedPersonnel, original, projectLibraryBase);
 
@@ -1620,6 +1620,15 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 		if (ObjectUtils.isNotEmpty(personnel)) {
 			projectId = personnel.getProjectId();
 		}
+		ProjectLibraryBase projectLibraryBase = projectLibraryBaseMapper.selectById(projectId);
+		//修改当前属于当前责任领域的法规清单的人员权限
+		List<String> belongs = new ArrayList<>();
+		belongs.add(ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_DESIGN_INITIATOR.getValue());
+		belongs.add(ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_DESIGN_DUTY.getValue());
+		belongs.add(ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_PREHOMO_INITIATOR.getValue());
+		belongs.add(ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_PREHOMO_DUTY.getValue());
+		belongs.add(ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_VERIFY_INITIATOR.getValue());
+		belongs.add(ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_VERIFY_DUTY.getValue());
 
 		Date now = new Date();
 		for (String id : projectRelatedPersonnel.getIds().split(",")) {
@@ -1675,6 +1684,9 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 				projectUserPermissionService.remove(delPermissionQueryWrapper);
 			}
 			projectRelatedPersonnelList.add(projectRelatedPersonnelTemp);
+			//修改当前属于当前责任领域的法规清单的人员权限
+			ProjectRelatedPersonnel original = baseMapper.selectById(projectRelatedPersonnel.getId());
+			setLawsInventoryPermission(projectRelatedPersonnel.getProjectId(), belongs, projectRelatedPersonnel, original, projectLibraryBase);
 		}
 		this.updateBatchById(projectRelatedPersonnelList);