From 6950f2b18f198c56e4f4116244b2b1b8e200b419 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Fri, 14 Apr 2023 13:46:58 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/views/projectManagement/components/batSetting.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-web/src/views/projectManagement/components/batSetting.vue b/jero-web/src/views/projectManagement/components/batSetting.vue
index 2519d5201..d55ab9c88 100644
--- a/jero-web/src/views/projectManagement/components/batSetting.vue
+++ b/jero-web/src/views/projectManagement/components/batSetting.vue
@@ -405,7 +405,7 @@
         this.$nextTick(() => {
           this.ids = data || []
           this.formInline = {}
-          if (content) {
+          if (content && code == '0') {
             this.formInline.dutyTerritory = content.dutyTerritory
             this.queryPersonByProject(content)
           }

From 728aa1cabbe2bc5f0664565a37f6eea90e75b7b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Fri, 14 Apr 2023 13:53:20 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js                |  1 +
 jero-web/src/common/lang/zh-cn.js                |  1 +
 .../projectManagement/components/batSetting.vue  | 16 ++++++++--------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 15f2fa326..712f06b0b 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1785,4 +1785,5 @@ module.exports = {
   onlyDesignComplianceConfirmationSelected:'Only data with a design compliance confirmation process status of task to be confirmed, result to be submitted, or verification compliance confirmation process status of task to be confirmed, result to be submitted can be selected',
   oneThePersonnelMustBeSelected:'One of the personnel must be selected',
   pleaseSelectRegulatoryCurrentLogin:'Please select Regulatory Engineer as the data for the current login',
+  cannotSetResponsibilityAreas:'Cannot set an interface person due to different responsibility areas',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 227b81d1a..0dd332c63 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1887,4 +1887,5 @@ module.exports = {
   onlyDesignComplianceConfirmationSelected:'只能选择设计符合性确认流程状态为任务待确认、结果待提交或验证符合性确认流程状态为任务待确认、结果待提交的数据',
   oneThePersonnelMustBeSelected:'必须选择其中一个人员',
   pleaseSelectRegulatoryCurrentLogin:'请选择法规工程师为当前登录人的数据',
+  cannotSetResponsibilityAreas:'所属不同责任领域，不能设置接口人',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/batSetting.vue b/jero-web/src/views/projectManagement/components/batSetting.vue
index d55ab9c88..216718257 100644
--- a/jero-web/src/views/projectManagement/components/batSetting.vue
+++ b/jero-web/src/views/projectManagement/components/batSetting.vue
@@ -100,7 +100,7 @@
                       :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
             </div>
             <a-form-model-item class="itemModel" prop="designDutyId">
-              <a-select :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"
+              <a-select :placeholder="$t('cannotSetResponsibilityAreas')"
                         class="box-input"
                         allowClear
                         :getPopupContainer="triggerNode=> triggerNode.parentNode"
@@ -382,13 +382,13 @@
           if (res.success) {
             this.regulatoryEngineerList = res.result.lawEngineerList || [] //法规工程师
             this.engineeringInterfacePersonList = res.result.engineeringInterfacePersonList || [] //工程接口人
-            if (this.regulatoryEngineerList.length == 1) {
-              this.formInline.regulationOwnerId = this.regulatoryEngineerList[0].value
-            }
-            if (this.engineeringInterfacePersonList.length == 1) {
-              this.formInline.engineeringInterfacePerson = this.engineeringInterfacePersonList[0].value
-            }
-            this.formInline = {...this.formInline}
+            // if (this.regulatoryEngineerList.length == 1) {
+            //   this.formInline.regulationOwnerId = this.regulatoryEngineerList[0].value
+            // }
+            // if (this.engineeringInterfacePersonList.length == 1) {
+            //   this.formInline.engineeringInterfacePerson = this.engineeringInterfacePersonList[0].value
+            // }
+            // this.formInline = {...this.formInline}
           }
         })
       },

From 7a257f731ba5f8dac918507053bf0da2a284d4d0 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 14 Apr 2023 14:02:17 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=A3=9E=E4=B9=A6=E6=B6=88=E6=81=AF-?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=8F=82=E6=95=B0=E6=B8=85=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParamsCollectManifestEOServiceImpl.java   | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

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 39af28dae..fbc885a74 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
@@ -2309,7 +2309,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
                     params.put("userIdList",userIdList);
                     params.put("projectCn",projectInfo.getProjectName());
                     params.put("projectEn",projectInfo.getProjectNameEn());
-                    params.put("initiator",currentUser.getUsername());
+                    params.put("initiatorCn",currentUser.getUsername());
+                    params.put("initiatorEn",currentUser.getUsername());
                     params.put("back_url_cn",hrefFeishuCn);
                     params.put("back_url_en",hrefFeishuEn);
                     feishuService.sendMessageHomoParameterCollection(TemplateInfoEnum2.HOMO_PARAMETER_COLLECTION_BACK.getValue(),params,null);
@@ -2330,7 +2331,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
                     params.put("userIdList",sdtIdList);
                     params.put("projectCn",projectInfo.getProjectName());
                     params.put("projectEn",projectInfo.getProjectNameEn());
-                    params.put("initiator",currentUser.getUsername());
+                    params.put("initiatorCn",currentUser.getUsername());
+                    params.put("initiatorEn",currentUser.getUsername());
                     params.put("back_url_cn",hrefFeishuCn);
                     params.put("back_url_en",hrefFeishuEn);
                     feishuService.sendMessageHomoParameterCollection(TemplateInfoEnum2.HOMO_PARAMETER_COLLECTION_BACK.getValue(),params,null);
@@ -2417,7 +2419,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
         params.put("userIdList",userIdList);
         params.put("projectCn",projectInfo.getProjectName());
         params.put("projectEn",projectInfo.getProjectNameEn());
-        params.put("initiator",currentUser.getUsername());
+        params.put("initiatorCn",currentUser.getUsername());
+        params.put("initiatorEn",currentUser.getUsername());
         params.put("dueDate","");
         params.put("back_url_cn",hrefFeishuCn);
         params.put("back_url_en",hrefFeishuEn);
@@ -2655,7 +2658,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
             params.put("userIdList",Arrays.asList(sysUser.getId().split(",")));
             params.put("projectCn",projectInfo.getProjectName());
             params.put("projectEn",projectInfo.getProjectNameEn());
-            params.put("initiator",currentUser.getUsername());
+            params.put("initiatorCn",currentUser.getUsername());
+            params.put("initiatorEn",currentUser.getUsername());
             params.put("dueDate",sdf.format(deadline));
             params.put("back_url_cn",hrefFeishuCn);
             params.put("back_url_en",hrefFeishuEn);
@@ -2830,7 +2834,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
                         params.put("userIdList",Arrays.asList(sysUser.getId().split(",")));
                         params.put("projectCn",projectInfo.getProjectName());
                         params.put("projectEn",projectInfo.getProjectNameEn());
-                        params.put("initiator",currentUser.getUsername());
+                        params.put("initiatorCn",currentUser.getUsername());
+                        params.put("initiatorEn",currentUser.getUsername());
                         params.put("dueDate",sdf.format(deadline));
                         params.put("back_url_cn",hrefFeishuCn);
                         params.put("back_url_en",hrefFeishuEn);
@@ -6800,7 +6805,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
         params.put("userIdList",userIdList);
         params.put("projectCn",projectInfo.getProjectName());
         params.put("projectEn",projectInfo.getProjectNameEn());
-        params.put("initiator",currentUser.getUsername());
+        params.put("initiatorCn",currentUser.getUsername());
+        params.put("initiatorEn",currentUser.getUsername());
         params.put("dueDate","");
         params.put("back_url_cn",hrefFeishuCn);
         params.put("back_url_en",hrefFeishuEn);
@@ -6936,7 +6942,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
                     params.put("userIdList",Arrays.asList(sysUser.getId().split(",")));
                     params.put("projectCn",projectInfo.getProjectName());
                     params.put("projectEn",projectInfo.getProjectNameEn());
-                    params.put("initiator",currentUser.getUsername());
+                    params.put("initiatorCn",currentUser.getUsername());
+                    params.put("initiatorEn",currentUser.getUsername());
                     params.put("back_url_cn",hrefFeishuCn);
                     params.put("back_url_en",hrefFeishuEn);
                     params.put("dueDate",sdf.format(deadline));
@@ -6998,7 +7005,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
                     params.put("userIdList",Arrays.asList(sysUser.getId().split(",")));
                     params.put("projectCn",projectInfo.getProjectName());
                     params.put("projectEn",projectInfo.getProjectNameEn());
-                    params.put("initiator",currentUser.getUsername());
+                    params.put("initiatorCn",currentUser.getUsername());
+                    params.put("initiatorEn",currentUser.getUsername());
                     params.put("back_url_cn",hrefFeishuCn);
                     params.put("back_url_en",hrefFeishuEn);
                     params.put("dueDate",sdf.format(deadline));
@@ -7052,7 +7060,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
                     params.put("userIdList",Arrays.asList(sysUser.getId().split(",")));
                     params.put("projectCn",projectInfo.getProjectName());
                     params.put("projectEn",projectInfo.getProjectNameEn());
-                    params.put("initiator",currentUser.getUsername());
+                    params.put("initiatorCn",currentUser.getUsername());
+                    params.put("initiatorEn",currentUser.getUsername());
                     params.put("dueDate",sdf.format(deadline));
                     params.put("back_url_cn",hrefFeishuCn);
                     params.put("back_url_en",hrefFeishuEn);