From 8ac3595c47b5b4ddc93b5940f80205315f9d3c2f Mon Sep 17 00:00:00 2001
From: gaosong <gao1532114>
Date: Tue, 26 Dec 2023 18:41:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProblemManagementEOServiceImpl.java  |  2 ++
 .../projectNonConformance/moudles/addModel.vue        | 11 +++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java
index 8cde535b8..bc1f766df 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java
@@ -107,6 +107,8 @@ public class ProblemManagementEOServiceImpl extends ServiceImpl<ProblemManagemen
 			List<ProblemManagementVO> progressTrackingList = problemManagementEO.getProgressTrackingList();
 			List<String> collect = progressTrackingList.stream().map(ProblemManagementVO::getProgressTracking).collect(Collectors.toList());
 			problemManagementEO.setProgressTracking(StringUtils.join(collect,","));
+		}else{
+			problemManagementEO.setProgressTracking("");
 		}
 		if(!problemManagementEO.getApprovalEvidenceLinkList().isEmpty()){
 			List<ProblemManagementVO> approvalEvidenceLinkList = problemManagementEO.getApprovalEvidenceLinkList();
diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue
index 071006a9e..dc8e5fae2 100644
--- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue
+++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue
@@ -620,9 +620,6 @@
           ]
         },
         formInline: {
-          fileLinkList: [{}],
-          progressTrackingList: [],
-          approvalEvidenceLinkList: [{}],
           dutyTerritory: undefined,
           projectId: undefined,
           problemState: undefined
@@ -799,19 +796,21 @@
         if (this.formInline.problemState == null) {
           this.formInline.problemState = undefined
         }
-        if (this.formInline.progressTrackingList == null) {
+        if (!this.formInline.progressTrackingList) {
           this.formInline.progressTrackingList = []
         } else {
           this.formInline.progressTrackingList.forEach(val => {
             val.isDescription = true
           })
         }
-        if (this.formInline.approvalEvidenceLinkList == null) {
+        if (!this.formInline.approvalEvidenceLinkList || (this.formInline.approvalEvidenceLinkList && this.formInline.approvalEvidenceLinkList.length == 0)) {
           this.formInline.approvalEvidenceLinkList = [{}]
         }
-        if (this.formInline.fileLinkList == null) {
+        if (!this.formInline.fileLinkList || (this.formInline.fileLinkList && this.formInline.fileLinkList.length == 0)) {
           this.formInline.fileLinkList = [{}]
         }
+        this.formInline = {...this.formInline}
+        console.log(this.formInline)
         this.visible = true
         this.disabled = false
         this.templateDisabled = true