Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java

@@ -3073,6 +3073,21 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 				this.saveBatch(datas);
 
 				this.saveProjectCertificationInventoryLog(datas,OperatorTypeEnum.CERTIFICATION_INVENTORY_IMPORT_ADD.getValue());
+
+				Date now = new Date();
+				//设置权限 先删后加
+				List<ProjectUserPermission> adds = new ArrayList<>();
+				for (ProjectCertificationInventoryEO pci: datas) {
+					if (ObjectUtils.isNotEmpty(pci.getSdt())) {
+						setProjectCertificationInventoryPermission(pci.getSdt(), pci.getProjectLibraryId(), pci.getId(), now, adds, ProjectUserLocationEnum.PROJECT_CERTIFICATION_INVENTORY_SDT.getValue());
+					}
+					if (ObjectUtils.isNotEmpty(pci.getDutyPerson())) {
+						setProjectCertificationInventoryPermission(pci.getDutyPerson(), pci.getProjectLibraryId(), pci.getId(), now, adds, ProjectUserLocationEnum.PROJECT_CERTIFICATION_INVENTORY_DP.getValue());
+					}
+				}
+				if (ObjectUtils.isNotEmpty(adds)) {
+					projectUserPermissionService.saveBatch(adds);
+				}
 			}
 		}
 	}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java

@@ -470,6 +470,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 		List<Map<String,Object>> lawEngineerList = new ArrayList<>();
 		List<Map<String,Object>> certificationEngineerList = new ArrayList<>();
 		List<Map<String,Object>> engineeringInterfacePersonList = new ArrayList<>();
+
 		List<Map<String,Object>> studioPersonList = new ArrayList<>();
 		//项目的studio用户
 		LambdaQueryWrapper<ProjectLibraryBase> wrapper = new LambdaQueryWrapper<>();
@@ -510,6 +511,19 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 						userIdList.add(engineeringInterfacePerson);
 					}
 				}
+
+				if(StringUtils.isNotBlank(projectRelatedPersonnel.getEngineerLawSet())){
+					String[] engineerLawSetArr = projectRelatedPersonnel.getEngineerLawSet().split(",");
+					for (String engineerLawSet : engineerLawSetArr) {
+						userIdList.add(engineerLawSet);
+					}
+				}
+				if(StringUtils.isNotBlank(projectRelatedPersonnel.getEngineerAttSet())){
+					String[] engineerAttSetArr = projectRelatedPersonnel.getEngineerAttSet().split(",");
+					for (String engineerAttSet : engineerAttSetArr) {
+						userIdList.add(engineerAttSet);
+					}
+				}
 			}
 			userIdList.add(studioEngineer);
 			List<SysUser> sysUserList = new ArrayList<>();
@@ -558,6 +572,33 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 					}
 				}
 
+				if(StringUtils.isNotBlank(projectRelatedPersonnel.getEngineerLawSet())){
+					String[] engineerLawSetArr = projectRelatedPersonnel.getEngineerLawSet().split(",");
+					for (String engineerLawSet : engineerLawSetArr) {
+						for (SysUser sysUser : sysUserList) {
+							if(StringUtils.equals(engineerLawSet,sysUser.getId())){
+								Map<String,Object> map = new HashMap<>();
+								map.put("name",sysUser.getUsername());
+								map.put("value",sysUser.getId());
+								engineeringInterfacePersonList.add(map);
+							}
+						}
+					}
+				}
+				if(StringUtils.isNotBlank(projectRelatedPersonnel.getEngineerAttSet())){
+					String[] engineerAttSetArr = projectRelatedPersonnel.getEngineerAttSet().split(",");
+					for (String engineerAttSet : engineerAttSetArr) {
+						for (SysUser sysUser : sysUserList) {
+							if(StringUtils.equals(engineerAttSet,sysUser.getId())){
+								Map<String,Object> map = new HashMap<>();
+								map.put("name",sysUser.getUsername());
+								map.put("value",sysUser.getId());
+								engineeringInterfacePersonList.add(map);
+							}
+						}
+					}
+				}
+
 				if (StringUtils.isNotBlank(studioEngineer)) {
 					for (SysUser sysUser : sysUserList) {
 						if (StringUtils.equals(studioEngineer, sysUser.getId())) {

jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue

@@ -364,6 +364,7 @@ h1{
   width: calc(100% - 130px);
   display: inline-block;
   margin-top: 2px;
+  height: 40px;
 }
 
 .box-input {