diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 9ffc6c5d9..3c805bcd0 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -1481,9 +1481,13 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
                 map.put("click", true);
             }
 
-            if ("description".equals(dbFieldName) && StringUtils.isBlank(paramsManifestEO.getReferencesColName())) {
+            if ("description".equals(dbFieldName)
+                    && ObjectUtils.isNotEmpty(paramsManifestEO)
+                    && StringUtils.isBlank(paramsManifestEO.getReferencesColName())) {
                 indexOfDescription = i;
-            } else if ("references_col".equals(dbFieldName) && StringUtils.isNotBlank(paramsManifestEO.getReferencesColName())) {
+            } else if ("references_col".equals(dbFieldName)
+                    && ObjectUtils.isNotEmpty(paramsManifestEO)
+                    && StringUtils.isNotBlank(paramsManifestEO.getReferencesColName())) {
                 indexOfDescription = i;
             }
 
@@ -1492,7 +1496,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
             }
             if (CutEnum.CN.getValue().equals(cut)) {
                 if ("references_col".equals(dbFieldName)) {
-                    if (StringUtils.isNotBlank(paramsManifestEO.getReferencesColName())) {
+                    if (ObjectUtils.isNotEmpty(paramsManifestEO) && StringUtils.isNotBlank(paramsManifestEO.getReferencesColName())) {
                         map.put("type", true); // 标识
                         map.put("flag", true); // 标识
                         map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName));
@@ -1509,7 +1513,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
                 }
             } else {
                 if ("references_col".equals(dbFieldName)) {
-                    if (StringUtils.isNotBlank(paramsManifestEO.getReferencesColName())) {
+                    if (ObjectUtils.isNotEmpty(paramsManifestEO)
+                            && StringUtils.isNotBlank(paramsManifestEO.getReferencesColName())) {
                         map.put("type", true); // 标识
                         map.put("flag", true); // 标识
                         map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName));
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java
index 8dd630c96..038a8549d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java
@@ -314,7 +314,7 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
                 for (ParamsConfigEO paramsConfigEO : paramsConfigEOList) {
                     HeadCustomVO headCustomVO = new HeadCustomVO();
                     headCustomVO.setDb_field_name(paramsConfigEO.getId());
-                    headCustomVO.setDb_field_txt(String.valueOf(count++));
+                    headCustomVO.setDb_field_txt(paramsConfigEO.getConfigName());
                     headCustomVO.setIsLock(paramsConfigEO.getIsLock());
                     headCustomVO.setType("true");
                     headCustomVOList.add(headCustomVO);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java
index 5868282ee..ef7c6f917 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java
@@ -23,6 +23,7 @@ import com.jero.modules.project.mapper.ProjectYearNameInfoEOMapper;
 import com.jero.modules.project.service.IProjectLawsInventoryEOService;
 import com.jero.modules.project.service.IProjectLibraryBaseService;
 import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.system.enums.ProjectRoleEnum;
 import com.jero.modules.system.service.ISysUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -132,7 +133,7 @@ public class InventoryAffirmJob implements Job {
                         String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
                         String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
                         // 获取法规清单 - 飞书跳转链接
-                        Map<String, Object> hrefFeishuMap = this.projectLawsInventoryEOService.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN);
+                        Map<String, Object> hrefFeishuMap = this.projectLawsInventoryEOService.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, ProjectRoleEnum.REGULATI_ENGINEER.getValue());
                         params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
                         params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
                         params.put("Initiator",projectLibraryBase.getStudioEngineerName());
@@ -161,7 +162,7 @@ public class InventoryAffirmJob implements Job {
                         String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
                         String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
                         // 获取法规清单 - 飞书跳转链接
-                        Map<String, Object> hrefFeishuMap = this.projectLawsInventoryEOService.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN);
+                        Map<String, Object> hrefFeishuMap = this.projectLawsInventoryEOService.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN,ProjectRoleEnum.REGULATI_ENGINEER.getValue());
                         params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
                         params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
                         params.put("Initiator",projectLibraryBase.getStudioEngineerName());
@@ -190,7 +191,7 @@ public class InventoryAffirmJob implements Job {
                         String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
                         String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
                         // 获取法规清单 - 飞书跳转链接
-                        Map<String, Object> hrefFeishuMap = this.projectLawsInventoryEOService.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN);
+                        Map<String, Object> hrefFeishuMap = this.projectLawsInventoryEOService.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN,ProjectRoleEnum.REGULATI_ENGINEER.getValue());
                         params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
                         params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
                         params.put("Initiator",projectLibraryBase.getStudioEngineerName());
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java
index 75e309358..8422527a0 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java
@@ -208,7 +208,7 @@ public interface IProjectLawsInventoryEOService extends IService<ProjectLawsInve
 
 	void sendMessageByTemplateId(String templeteId,Map<String,Object> params);
 
-	Map<String, Object> getProjectLawsInventoryLinkHrefFeishu(String projectLibraryId, String PRN_CN, String PRN_EN);
+	Map<String, Object> getProjectLawsInventoryLinkHrefFeishu(String projectLibraryId, String PRN_CN, String PRN_EN,String roleOpen);
 
 	/**
 	 * 获取待办中心跳转链接
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
index 8704b8c3e..c8cb9ad00 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
@@ -4410,9 +4410,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
 			List<SysUser> studioEngineerUserInfo = this.sysUserService.querySysUserListByIdList(Arrays.asList(projectLibraryBase.getStudioEngineer().split(",")));
 
-			List<String> certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","));
-			List<SysUser> certificationEngineerList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList);
-			String certificationEngineerUserNames = certificationEngineerList.stream().map(SysUser::getUsername).distinct().collect(Collectors.joining(","));
+			String certificationEngineerUserNames = "";
+			if(StringUtils.isNotBlank(projectLibraryBase.getCertificationEngineer())){
+				List<String> certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","));
+				List<SysUser> certificationEngineerList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList);
+				certificationEngineerUserNames = certificationEngineerList.stream().map(SysUser::getUsername).distinct().collect(Collectors.joining(","));
+			}
 
 			List<ProjectCertificationInventoryLogEO> pciLogEOList = new ArrayList<>();
 			for (ProjectCertificationInventoryEO pci : pciList) {
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 ed7b2ed78..92bed5f19 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
@@ -6486,7 +6486,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 			String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 			// 获取法规清单 - 飞书跳转链接
-			Map<String, Object> hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN);
+			Map<String, Object> hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue());
 			paramsMsg.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
 			paramsMsg.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
 			paramsMsg.put("Initiator",projectLibraryBase.getStudioEngineerName());
@@ -10336,7 +10336,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 				String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 				// 获取法规清单 - 飞书跳转链接
-				Map<String, Object> hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN);
+				Map<String, Object> hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue());
 				params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
 				params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
 				params.put("Initiator",projectLibraryBase.getStudioEngineerName());
@@ -10575,7 +10575,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 				String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 				// 获取法规清单 - 飞书跳转链接
-				Map<String, Object> hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN);
+				Map<String, Object> hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue());
 				params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
 				params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
 				params.put("Initiator",projectLibraryBase.getStudioEngineerName());
@@ -11263,7 +11263,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 		String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 		// 获取法规清单 - 飞书跳转链接
-		Map<String, Object> hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN);
+		Map<String, Object> hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue());
 		params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
 		params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
 		params.put("Initiator",projectLibraryBase.getStudioEngineerName());
@@ -11352,7 +11352,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 		String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 		// 获取法规清单 - 飞书跳转链接
-		Map<String, Object> hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN);
+		Map<String, Object> hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue());
 		params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
 		params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
 		params.put("Initiator",projectLibraryBase.getStudioEngineerName());
@@ -11420,7 +11420,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		params.put("serialNumbers",serialNumbers);
 
 		// 获取法规清单 - 飞书跳转链接
-		Map<String, Object> hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN);
+		Map<String, Object> hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue());
 		params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
 		params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
 		params.put("Initiator",projectLibraryBase.getStudioEngineerName());
@@ -11527,21 +11527,23 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 	}
 
 	@Override
-	public Map<String, Object> getProjectLawsInventoryLinkHrefFeishu(String projectLibraryId, String PRN_CN, String PRN_EN) {
+	public Map<String, Object> getProjectLawsInventoryLinkHrefFeishu(String projectLibraryId, String PRN_CN, String PRN_EN,String roleOpen) {
 		Map<String,Object> result = new HashMap<>();
 
 		String hrefFeishu_CN = backUrl
 				+ JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink()
 				+ projectLibraryId
 				+ JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType()
-				+ "&projectName=" + PRN_CN;
+				+ "&projectName=" + PRN_CN
+				+ "&roleOpen=" + roleOpen;
 
 		//飞书跳转链接
 		String hrefFeishu_EN = backUrl
 				+ JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink()
 				+ projectLibraryId
 				+ JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType()
-				+ "&projectName=" + PRN_EN;
+				+ "&projectName=" + PRN_EN
+				+ "&roleOpen=" + roleOpen;
 
 		result.put("hrefFeishu_CN",hrefFeishu_CN);
 		result.put("hrefFeishu_EN",hrefFeishu_EN);
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 4b95b3d6f..cc1edc48d 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -1504,8 +1504,8 @@
         getAction(this.url.AndUserId, query).then((res) => {
           if (res.success) {
             // this.isDisplay = true
-            if (this.$route.query.roleOpen && this.$route.query.roleOpen == 'fggcs'){
-              this.formInlineRoleSwitching.roleSwitchingCode = '1'
+            if (this.$route.query.roleOpen){
+              this.formInlineRoleSwitching.roleSwitchingCode = this.$route.query.roleOpen
             }else{
               this.formInlineRoleSwitching.roleSwitchingCode = res.result.roleCode
             }
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
index 33e9aeef1..b7678eb70 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
@@ -267,7 +267,7 @@
               targetMarket: row.targetMarket,
               studioEngineer: row.studioEngineer,
               type: '102',
-              roleOpen:'fggcs',
+              roleOpen:'1',
             }
           })
           window.open(newUrl.href, '_blank')