From 5d30fcc0e00ecc16917434c91b47c4d26ec4652c Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 22 Sep 2023 10:19:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLawsInventoryEOServiceImpl.java    |  5 +++-
 .../components/listEditModel.vue              | 27 ++++++++++++++-----
 2 files changed, 25 insertions(+), 7 deletions(-)

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 ec500c9ff..7ac8b589b 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
@@ -515,7 +515,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 	public void editById(ProjectLawsInventoryEO projectLawsInventoryEO) {
 		this.editService.editById(projectLawsInventoryEO);
 		if(StringUtils.isNotBlank(projectLawsInventoryEO.getPlatformIds())){
-			lawsInventoryPlatformEOService.deleteByIds(Arrays.asList(projectLawsInventoryEO.getPlatformIds().split(",")));
+			LambdaQueryWrapper<LawsInventoryPlatformEO> wrapper = new LambdaQueryWrapper<>();
+			wrapper.eq(LawsInventoryPlatformEO::getLawsInventoryId,projectLawsInventoryEO.getId());
+			wrapper.in(LawsInventoryPlatformEO::getPlatformLawsInventoryId,Arrays.asList(projectLawsInventoryEO.getPlatformIds().split(",")));
+			lawsInventoryPlatformEOService.remove(wrapper);
 		}
 	}
 
diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue
index 1e6ea973c..f3d71970a 100644
--- a/jero-web/src/views/projectManagement/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/components/listEditModel.vue
@@ -1088,12 +1088,27 @@
         this.$refs.ruleForm.validate(valid => {
           if (valid) {
             let formInline = JSON.parse(JSON.stringify(this.formInline))
-            if(!formInline.projectLawsInventoryEOS){
-              Object.keys(formInline).forEach(res => {
-                if (formInline[res] && formInline[res] instanceof Array) {
-                  formInline[res] = formInline[res].join(',')
-                }
-              })
+              // Object.keys(formInline).forEach(res => {
+              //   if(!formInline.projectLawsInventoryEOS){
+              //     if (formInline[res] && formInline[res] instanceof Array) {
+              //       formInline[res] = formInline[res].join(',')
+              //     }
+              //   }
+              // })
+            if(formInline.designDeliverableType){
+              formInline.designDeliverableType = formInline.designDeliverableType.join(',')
+            }
+            if(formInline.dutyDepart){
+              formInline.dutyDepart = formInline.dutyDepart.join(',')
+            }
+            if(formInline.dutyTerritory){
+              formInline.dutyTerritory = formInline.dutyTerritory.join(',')
+            }
+            if(formInline.verifyDeliverableType){
+              formInline.verifyDeliverableType = formInline.verifyDeliverableType.join(',')
+            }
+            if(formInline.prehomoDeliverableType){
+              formInline.prehomoDeliverableType = formInline.prehomoDeliverableType.join(',')
             }
             if (!formInline.verifyDutyId) {
               formInline.verifyDutyId = ''