From 021b841c3c0d48a4b53d087575d4754d2adb51d7 Mon Sep 17 00:00:00 2001
From: gaosong <gao1532114>
Date: Tue, 21 Nov 2023 17:57:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0=E6=A8=A1?=
 =?UTF-8?q?=E7=89=88=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/service/impl/ParamsManifestEOServiceImpl.java  | 4 +---
 .../service/impl/ProjectLawsInventoryEOServiceImpl.java    | 4 ++--
 jero-web/src/views/parameter/ParameterTemplate/index.vue   | 7 ++++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
index c91e9f1e3..5c94ddde5 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
@@ -283,9 +283,6 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
             LambdaQueryWrapper<ParamsCollectManifestEO> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(ParamsCollectManifestEO::getParamsManifestId, cid);
             List<ParamsCollectManifestEO> paramsCollectManifestEOList = paramsCollectManifestEOService.list(queryWrapper);
-            for (ParamsCollectManifestEO peo:paramsCollectManifestEOList) {
-                peo.setState(CollectManifestStateEnum.WAIT_FILL.getValue());
-            }
             // 根据参数模板id发布版本查询对应参数项集合
             List<ParamsInfoPublishEO> paramsInfoPublishEOList = paramsInfoPublishEOService.getListByPublishVersion(mid, Integer.parseInt(version));
 
@@ -310,6 +307,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
                         target.setControlValues(source.getControlValues());
                         target.setControlVerify(source.getControlVerify());
                         target.setFileTemplateConnectId(source.getFileTemplateConnectId());
+                        target.setDescription(source.getDescription());
                         break;
                     }
                 }
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 e89f930a6..01438f915 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
@@ -434,7 +434,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					List<ProjectLawsInventoryEO> projectLawsInventoryEOListTemp = new ArrayList<>();
 					for (DummyInventoryInfoEO dummyInventoryInfoEO : dummyInventoryInfoEOListNew) {
 						List<ProjectLawsInventoryEO> collect = projectLawsInventoryEOList.stream()
-								.filter(e -> e.getSerialNumber().equals(dummyInventoryInfoEO.getSerialNumber())).collect(Collectors.toList());
+								.filter(e -> e.getSerialNumber().equals(dummyInventoryInfoEO.getSerialNumber())&&e.getDutyTerritory().equals(dummyInventoryInfoEO.getDutyTerritory())).collect(Collectors.toList());
 						if (collect.size() != 0) {
 							for (ProjectLawsInventoryEO lawsInventoryEO : collect) {
 								//数据对比
@@ -3715,7 +3715,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 	private ProjectLawsInventoryEO dataCompare(ProjectLawsInventoryEO projectLawsInventoryEO, DummyInventoryInfoEO dummyInventoryInfoEO) {
 		//编号
 		if (StringUtils.isBlank(projectLawsInventoryEO.getSerialNumber())) {
-			projectLawsInventoryEO.setSendMsgFlag(dummyInventoryInfoEO.getSerialNumber());
+			projectLawsInventoryEO.setSerialNumber(dummyInventoryInfoEO.getSerialNumber());
 		}
 		//标题
 		if (StringUtils.isBlank(projectLawsInventoryEO.getTitle())) {
diff --git a/jero-web/src/views/parameter/ParameterTemplate/index.vue b/jero-web/src/views/parameter/ParameterTemplate/index.vue
index 2f45d25bf..2d11a7f7b 100644
--- a/jero-web/src/views/parameter/ParameterTemplate/index.vue
+++ b/jero-web/src/views/parameter/ParameterTemplate/index.vue
@@ -69,13 +69,14 @@
            {{ text && text.length > 50 ? text.slice(0, 49) + '...' : text }}
         </span>
         <span slot="operation" slot-scope="text,record">
-          <a class="text-operation" v-has="'params:template:edit'" @click="edit(record)">{{$t('edit')}}</a>
+            <a class="text-operation" :disabled="record.status == '1' ? true : false" v-has="'params:template:edit'" @click="edit(record)">{{$t('edit')}}</a>
             <a class="text-operation"
                v-has="'params:template:publish'"
                @click="withdrawOrRelease(record)">{{record.status && record.status == '1'? $t('withdraw') : $t('release')}}</a>
-            <a class="text-operation" v-has="'params:template:maintenanceTemplate'"
+            <a class="text-operation" :disabled="record.status == '1' ? true : false" v-has="'params:template:maintenanceTemplate'"
                @click="maintenanceTemplateClick(record)">{{$t('maintenanceTemplate')}}</a>
-            <a class="text-operation" v-has="'params:template:delete'" @click="deleteLib(record)">{{$t('deleteLib')}}</a>
+            <a class="text-operation" :disabled="record.status == '1' ? true : false"
+               v-has="'params:template:delete'" @click="deleteLib(record)">{{$t('deleteLib')}}</a>
         </span>
       </a-table>
     </div>