From 0dc02894504b369bf3eb415888604c15db0c6930 Mon Sep 17 00:00:00 2001
From: gaosong <gao1532114>
Date: Thu, 18 Jan 2024 18:06:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E5=B8=A6=E5=85=A5=E6=8E=A5=E5=8F=A3=E4=BA=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParamsManifestEOController.java           |  4 +--
 .../ParamsCollectManifestEOServiceImpl.java   | 27 +++++++++++--------
 .../components/initiatingProcess.vue          | 11 ++++++++
 .../components/syncToList.vue                 |  2 +-
 4 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java
index fc2056eed..4a38d5790 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java
@@ -164,8 +164,8 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
 	}
 
     @ApiOperation(value = "参数清单-更新模板", notes = "参数清单-更新模板更新参数")
-    @PostMapping(value = "/updateModel")
-    public Result<?> updateModel(String mid, String version,String cid) {
+    @GetMapping(value = "/updateModel")
+    public Result<?> updateModel(@RequestParam(name="mid",required=true) String mid, @RequestParam(name="version",required=true) String version,@RequestParam(name="cid",required=true) String cid) {
         boolean isSuccess = paramsManifestEOService.updateModel(mid,version, cid);
         if (isSuccess) {
             return Result.OK("更新成功！");
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 bb73d3119..431d95982 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
@@ -4849,6 +4849,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
         String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
         String projectId = paramsCollectManifestVO.getProjectId();
         String cut = paramsCollectManifestVO.getCut();
+        String sdt = paramsCollectManifestVO.getSdt();
         LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 
         // 查询参数清单
@@ -4871,23 +4872,27 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
                 ParamsCollectManifestEO updateEO = new ParamsCollectManifestEO();
                 updateEO.setId(paramsCollectManifestEO.getId());
                 updateEO.setDutyTerritory(dutyTerritory);
-
-                // 根据负责领域处理工程接口人（零个，一个，多个）： 领域中仅有一个人时，添加该字段
-                ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritory(paramsManifestEO.getProjectVersionId(), dutyTerritory);
-                if (ObjectUtil.isNotEmpty(projectRelatedPersonnel)) {
-                    String sdtId = projectRelatedPersonnel.getEngineeringInterfacePerson();
-                    if (org.apache.commons.lang.StringUtils.isNotBlank(sdtId) && !sdtId.contains(",")) { // 领域中仅有一个人时，添加该字段
-                        SysUser sysUser = sysUserService.getById(sdtId);
-                        if (ObjectUtil.isNotEmpty(sysUser)) {
-                            updateEO.setSdt(sysUser.getUsername()); // 设置工程接口人
+                if(StringUtils.isNotBlank(sdt)){
+                    SysUser sysUser = sysUserService.getById(sdt);
+                    updateEO.setSdt(sysUser.getUsername()); // 设置工程接口人
+                }else{
+                    // 根据负责领域处理工程接口人（零个，一个，多个）： 领域中仅有一个人时，添加该字段
+                    ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritory(paramsManifestEO.getProjectVersionId(), dutyTerritory);
+                    if (ObjectUtil.isNotEmpty(projectRelatedPersonnel)) {
+                        String sdtId = projectRelatedPersonnel.getEngineeringInterfacePerson();
+                        if (org.apache.commons.lang.StringUtils.isNotBlank(sdtId) && !sdtId.contains(",")) { // 领域中仅有一个人时，添加该字段
+                            SysUser sysUser = sysUserService.getById(sdtId);
+                            if (ObjectUtil.isNotEmpty(sysUser)) {
+                                updateEO.setSdt(sysUser.getUsername()); // 设置工程接口人
+                            } else {
+                                updateEO.setSdt(""); // 设置工程接口人
+                            }
                         } else {
                             updateEO.setSdt(""); // 设置工程接口人
                         }
                     } else {
                         updateEO.setSdt(""); // 设置工程接口人
                     }
-                } else {
-                    updateEO.setSdt(""); // 设置工程接口人
                 }
 
                 updateEOList.add(updateEO);
diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
index 72d7a6744..b1910fcf8 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
@@ -72,6 +72,8 @@
                   <a-select
                     mode="multiple"
                     class="box-input"
+                    optionFilterProp="children"
+                    :filter-option="filterOption"
                     :value="evaluatorIds"
                     @change='evaluatorIdsChange'
                     :placeholder="$t('PleaseSelect')+$t('Assessor')"
@@ -137,6 +139,7 @@
       </div>
     </div>
     <JLoading :loading="JLoading">{{this.$t('pleaseWaitWhileRunning')}}</JLoading>
+    <JLoading :loading="searchJLoading">{{this.$t('loading')}}</JLoading>
     <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"/>
   </div>
 </template>
@@ -277,6 +280,7 @@
           }
         ],
         evaluatorIdsNameOptions: [],
+        searchJLoading:false,
       }
     },
     mounted() {
@@ -304,12 +308,19 @@
           return this.evaluatorIdsNameOptions = []
         }
         const query = { documentId: this.selectedRowKeysRecord[0].id }
+        this.searchJLoading = true
         getAction(this.url.getEvaluatorList, query).then((res) => {
           if (res.success) {
             this.evaluatorIdsNameOptions = res.result
           }
+          this.searchJLoading = false
         })
       },
+      filterOption(input, option) {
+        return (
+          option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        );
+      },
       disabledDate(current) {
         return current && current < moment().subtract(1, 'day')
       },
diff --git a/jero-web/src/views/parameter/ParameterTemplate/components/syncToList.vue b/jero-web/src/views/parameter/ParameterTemplate/components/syncToList.vue
index 1d7483a0b..06cabe095 100644
--- a/jero-web/src/views/parameter/ParameterTemplate/components/syncToList.vue
+++ b/jero-web/src/views/parameter/ParameterTemplate/components/syncToList.vue
@@ -175,7 +175,7 @@
               version:this.dataQuery.version,
             }
             this.confirmLoading = true
-            postAction('/params/manifest/updateModel', query).then((res) => {
+            getAction('/params/manifest/updateModel', query).then((res) => {
               if (res.success) {
                 this.$message.success(res.message)
                 this.visible = false