From 0555b22410a49394e02f458dd6db07c037a70515 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Wed, 16 Aug 2023 09:51:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86=E6=B8=85=E5=8D=95=E5=BC=95=E7=94=A8=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=83=A8=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../editImpl/ProjectLawsInventoryEOEditServiceImpl.java     | 4 +++-
 .../components/ParameterItemCollectionList.vue              | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/editImpl/ProjectLawsInventoryEOEditServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/editImpl/ProjectLawsInventoryEOEditServiceImpl.java
index aaa0124f4..3f12952e8 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/editImpl/ProjectLawsInventoryEOEditServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/editImpl/ProjectLawsInventoryEOEditServiceImpl.java
@@ -1272,7 +1272,9 @@ public class ProjectLawsInventoryEOEditServiceImpl {
         params.put("contentEn", contentEn);
         params.put("projectLibraryId", projectLawsInventoryEO.getProjectLibraryId());
         params.put("endTime", endTime);
-        params.put("userIdList", userIdList);
+        List<String> userIdListArr = new ArrayList<>();
+        userIdListArr.add(userIdList);
+        params.put("userIdList", userIdListArr);
         params.put("serialNumbers", projectLawsInventoryEO.getSerialNumber());
 
         String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index a76a38c4e..fdac5a6b0 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -560,7 +560,7 @@
             </span>
             <!--            引用参数-->
             <span v-else-if='jurisdiction === "DREYYCS"' class="text-wraning">
-              '{{$t('completed')}}'{{$t('or')}}'{{$t('ReturnedEngineer')}}'
+              '{{$t('completed')}}'{{$t('or')}}'{{$t('ReturnedEngineer')}}'{{$t('or')}}'{{$t('alteration')}}'
             </span>
             <!--            退回-->
             <span v-else-if='jurisdiction === "homoTH"' class="text-wraning" style='color: red'>
@@ -1685,6 +1685,7 @@
       // 填写人 引用参数 权限
       // 仅仅状态为 待填写 认证工程师退回 可以引用参数
       dreJurisdictionreferenceParameter() {
+        console.log(123)
         this.NotSelectedRowKeysValue = []
         let flag = 1
         if (this.selectedRowKeysValue.length == 0) {
@@ -1692,7 +1693,8 @@
           this.$message.warning(this.$t('selectLeastOne'))
         } else {
           this.selectedRowKeysValue.forEach((item, index) => {
-            if (item.state !== '待填写' && item.state !== '认证工程师退回' && item.state !== 'To be filled' && item.state !== 'Rejected by homo engineer') {
+            if (item.state !== '待填写' && item.state !== '认证工程师退回' && item.state !== 'To be filled'
+              && item.state !== 'Rejected by homo engineer' && item.state !== '变更' && item.state !== 'Modify') {
               this.NotSelectedRowKeysValue.push(item)
               flag = 0
             }