From 2755be6961b51fe4feb23012c093e0abf6ba00ee Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Tue, 5 Jul 2022 16:58:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20bug?=
 =?UTF-8?q?=20#56322=20=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86-=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E8=B5=B7=E8=8D=89=E4=BA=BA=E6=97=B6=20=E8=B5=B7?=
 =?UTF-8?q?=E8=8D=89=E9=83=A8=E9=97=A8=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=AF=B9?=
 =?UTF-8?q?=20=EF=BC=88=E4=BC=81=E6=A0=87=E7=BC=96=E5=86=99=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=EF=BC=89=E5=BA=94=E8=AF=A5=E6=98=AF=E4=B8=A4=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/qbrk/step1.vue            | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
index 968862d66..fd32e7a3b 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
@@ -1963,6 +1963,14 @@
                 }
                 return data
             },
+            filterStringDate(data){
+                if(data === undefined || data === null || data === '' || data === 'null'){
+                    return ""
+                }else {
+                    data = data.toString()
+                }
+                return data
+            },
             handleProcessStandardNext(status) {
                 switch (status) {
                     // 新增
@@ -1994,11 +2002,11 @@
                             // 引用标准
                             this.form.YYBZ = this.filterDate(this.standardCheckedList[0].esMatingRelations)
                             // 起草人带入
-                            this.form.QCRBUSS = this.filterDate(this.standardCheckedList[0].drafterName)
-                            this.form.QCRBUSSID = this.filterDate(this.standardCheckedList[0].drafter)
+                            this.form.QCRBUSS = this.filterStringDate(this.standardCheckedList[0].drafterName)
+                            this.form.QCRBUSSID = this.filterStringDate(this.standardCheckedList[0].drafter)
                             // 起草部门带入
-                            this.form.QCDW = this.filterDate(this.standardCheckedList[0].unitName)
-                            this.form.QCDWID = this.filterDate(this.standardCheckedList[0].unit)
+                            this.form.QCDW = this.filterStringDate(this.standardCheckedList[0].unitName)
+                            this.form.QCDWID = this.filterStringDate(this.standardCheckedList[0].unit)
                             this.form.TXLBBUSS = this.filterDate(this.standardCheckedList[0].tsJsonName)
                             this.form.menuId = this.filterDate(this.standardCheckedList[0].tsJson)
                             this.form.treeType = 'sarMs'

From ec138c9f44abaf0e2da618934ede6428fa787420 Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Tue, 5 Jul 2022 18:06:02 +0800
Subject: [PATCH 2/2] feat: There is no way the,  #56326 #56321

---
 .../enterpriseStandardPlan/index.vue          | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
index a48a0c3ba..6440abd35 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
@@ -1100,32 +1100,36 @@
                 this.modalshowflag2 = true
             },
             checkedRole2 (data) {
+
                 let idList = ''
                 let nameList = ''
-                let bmIdList = ''
-                let bmNameList = ''
                 data.forEach( item => {
                     if (nameList.length > 0) {
                         nameList += ','
                         idList += ','
-                        bmIdList += ','
-                        bmNameList += ','
                     }
                     idList += item.id
                     nameList += item.name
-                    bmIdList += item.topUnitId
-                    bmNameList += item.topUnit
                 })
+
                 if (this.type === 'resPerson') {
                     this.addForm.resPerson = idList
                     this.addForm.resPersonName = nameList
                 } else if (this.type === 'drafter') {
                     this.addForm.drafter = idList
                     this.addForm.drafterName = nameList
-                    this.addForm.unitName = bmNameList
-                    this.addForm.unit = bmIdList
+                    if(data && data.length > 0){
+                        const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
+                        const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
+                        this.addForm.unitName = institutionNameList
+                        this.addForm.unit = institutionIdList
+                    }
                 }
             },
+            unique(newArr) {
+                const res = new Map();
+                return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
+            },
             addDrawerSubmit () {
                 this.$refs['addForm'].validate((valid) => {
                     if (valid) {