From 154f1c521a1f8a740429e68b1e946839a3f184d5 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Tue, 7 Mar 2023 09:39:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=BA=93-=E6=B3=95=E8=A7=84=E3=80=81=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=20=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProjectLibraryBaseServiceImpl.java   | 57 +++++++++++++------
 1 file changed, 39 insertions(+), 18 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 4e2cfb5af..1663bdebf 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
@@ -21,16 +21,7 @@ import com.jero.modules.project.entity.ProjectRelatedPersonnel;
 import com.jero.modules.project.entity.ProjectTaskInventoryEO;
 import com.jero.modules.project.entity.ProjectTaskPlanning;
 import com.jero.modules.project.entity.ProjectUserPermission;
-import com.jero.modules.project.enums.CertificationProgressEnum;
-import com.jero.modules.project.enums.CurrentProjectStatusEnum;
-import com.jero.modules.project.enums.DesignComplianceStatusEnum;
-import com.jero.modules.project.enums.InventoryAffirmStatusEnum;
-import com.jero.modules.project.enums.OperatorTypeEnum;
-import com.jero.modules.project.enums.PermissionDescriptionEnum;
-import com.jero.modules.project.enums.ProjectRoleEnum;
-import com.jero.modules.project.enums.ProjectUserLocationEnum;
-import com.jero.modules.project.enums.TaskAffirmStatusEnum;
-import com.jero.modules.project.enums.TopEnum;
+import com.jero.modules.project.enums.*;
 import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper;
 import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
 import com.jero.modules.project.mapper.ProjectNameInfoEOMapper;
@@ -186,12 +177,23 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		//创建任务计划时间轴
 		projectTaskPlanningService.setProjectTaskPlanning(projectLibraryBase.getId());
 
-		//初始化当前项目的studio与项目库 角色关系
-		ProjectLibraryRoleRelEO projectLibraryRoleRelEO = new ProjectLibraryRoleRelEO();
-		projectLibraryRoleRelEO.setProjectLibraryId(projectLibraryBase.getId());
-		projectLibraryRoleRelEO.setUserId(projectLibraryBase.getStudioEngineer());
-		projectLibraryRoleRelEO.setRoleCode(ProjectRoleEnum.STUDIO_ENGINEER.getValue());
-		projectLibraryRoleRelEOService.add(projectLibraryRoleRelEO);
+		List<ProjectLibraryRoleRelEO> projectLibraryRoleRelEOList = new ArrayList<>();
+		//初始化当前项目的studio与项目库 法规清单 角色关系
+		ProjectLibraryRoleRelEO lawsInventoryRoleRelEO = new ProjectLibraryRoleRelEO();
+		lawsInventoryRoleRelEO.setProjectLibraryId(projectLibraryBase.getId());
+		lawsInventoryRoleRelEO.setUserId(projectLibraryBase.getStudioEngineer());
+		lawsInventoryRoleRelEO.setRoleCode(ProjectRoleEnum.STUDIO_ENGINEER.getValue());
+		lawsInventoryRoleRelEO.setModelType(RoleRelModelTypeEnum.LAWS_INVENTORY.getValue());
+		projectLibraryRoleRelEOList.add(lawsInventoryRoleRelEO);
+
+		// 初始化当前项目的studio与项目库 认证清单 角色关系
+		ProjectLibraryRoleRelEO certificationInventoryRoleRelEO = new ProjectLibraryRoleRelEO();
+		certificationInventoryRoleRelEO.setProjectLibraryId(projectLibraryBase.getId());
+		certificationInventoryRoleRelEO.setUserId(projectLibraryBase.getStudioEngineer());
+		certificationInventoryRoleRelEO.setRoleCode(ProjectRoleEnum.STUDIO_ENGINEER.getValue());
+		certificationInventoryRoleRelEO.setModelType(RoleRelModelTypeEnum.CERTIFICATION_INVENTORY.getValue());
+		projectLibraryRoleRelEOList.add(certificationInventoryRoleRelEO);
+		this.projectLibraryRoleRelEOService.saveBatch(projectLibraryRoleRelEOList);
 
 		//项目权限表添加
 		List<ProjectUserPermission> adds = new ArrayList<>();
@@ -393,12 +395,31 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		delCertificationPermission.eq("project_id", projectLibraryBase.getId()).eq("belong", ProjectUserLocationEnum.PROJECT_ADD_CERTIFICATION.getValue());
 		projectUserPermissionService.remove(delCertificationPermission);
 
-		// 初始化当前项目的studio与项目库 角色关系
+		/*// 初始化当前项目的studio与项目库 角色关系
 		ProjectLibraryRoleRelEO projectLibraryRoleRelEO = new ProjectLibraryRoleRelEO();
 		projectLibraryRoleRelEO.setProjectLibraryId(projectLibraryBase.getId());
 		projectLibraryRoleRelEO.setUserId(projectLibraryBase.getStudioEngineer());
 		projectLibraryRoleRelEO.setRoleCode(ProjectRoleEnum.STUDIO_ENGINEER.getValue());
-		projectLibraryRoleRelEOService.add(projectLibraryRoleRelEO);
+		projectLibraryRoleRelEOService.add(projectLibraryRoleRelEO);*/
+
+		List<ProjectLibraryRoleRelEO> projectLibraryRoleRelEOList = new ArrayList<>();
+		//初始化当前项目的studio与项目库 法规清单 角色关系
+		ProjectLibraryRoleRelEO lawsInventoryRoleRelEO = new ProjectLibraryRoleRelEO();
+		lawsInventoryRoleRelEO.setProjectLibraryId(projectLibraryBase.getId());
+		lawsInventoryRoleRelEO.setUserId(projectLibraryBase.getStudioEngineer());
+		lawsInventoryRoleRelEO.setRoleCode(ProjectRoleEnum.STUDIO_ENGINEER.getValue());
+		lawsInventoryRoleRelEO.setModelType(RoleRelModelTypeEnum.LAWS_INVENTORY.getValue());
+		projectLibraryRoleRelEOList.add(lawsInventoryRoleRelEO);
+
+		// 初始化当前项目的studio与项目库 认证清单 角色关系
+		ProjectLibraryRoleRelEO certificationInventoryRoleRelEO = new ProjectLibraryRoleRelEO();
+		certificationInventoryRoleRelEO.setProjectLibraryId(projectLibraryBase.getId());
+		certificationInventoryRoleRelEO.setUserId(projectLibraryBase.getStudioEngineer());
+		certificationInventoryRoleRelEO.setRoleCode(ProjectRoleEnum.STUDIO_ENGINEER.getValue());
+		certificationInventoryRoleRelEO.setModelType(RoleRelModelTypeEnum.CERTIFICATION_INVENTORY.getValue());
+		projectLibraryRoleRelEOList.add(certificationInventoryRoleRelEO);
+		this.projectLibraryRoleRelEOService.saveBatch(projectLibraryRoleRelEOList);
+
 		//重新设置当前项目studio项目权限
 		List<ProjectUserPermission> engineers = new ArrayList<>();
 		ProjectUserPermission studioPermission = new ProjectUserPermission();