From da7691db33209d08002d432ef507a6cce39c0c77 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 29 Aug 2022 14:21:55 +0800
Subject: [PATCH] BUG 30991

---
 .../xiushan/apps/AppAccountXiushan/AppAccountXiushan.vue  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/project/xiushan/apps/AppAccountXiushan/AppAccountXiushan.vue b/project/xiushan/apps/AppAccountXiushan/AppAccountXiushan.vue
index cdb8ddcf..071d0fb3 100644
--- a/project/xiushan/apps/AppAccountXiushan/AppAccountXiushan.vue
+++ b/project/xiushan/apps/AppAccountXiushan/AppAccountXiushan.vue
@@ -56,7 +56,7 @@
     <ai-dialog title="功能分配" :visible.sync="dialog" width="800px" @open="initDialogData" @onConfirm="updateAccount">
       <el-form ref="updateAccountForm" :model="dialogForm" :rules="rules" size="small"
                label-width="120px">
-        <el-form-item label="姓名" prop="name" v-if="dialogForm.sysUserIds.length==1">
+        <el-form-item label="姓名" prop="name" v-if="isBatchAllot">
           <el-input placeholder="请输入姓名" v-model="dialogForm.name" clearable/>
         </el-form-item>
         <el-form-item required label="角色" prop="roleId">
@@ -89,6 +89,7 @@ export default {
   },
   computed: {
     ...mapState(['user']),
+    isBatchAllot: v => v.dialogForm.sysUserIds?.length > 1,
     cascaderProps() {
       return {
         value: 'id',
@@ -185,14 +186,13 @@ export default {
     },
     // 获取党组织树形
     searchSysAll() {
-      if (this.user.info.organizationId && this.optionsParty.length == 0) {
+      if (this.user.info.organizationId && this.optionsParty?.length == 0) {
         this.instance.post('/app/partyOrganization/queryPartyOrganizationServiceList').then((res) => {
           if (res?.data) {
             res.data = res.data.map(a => {
               return {...a, label: a.name}
             });
-            this.optionsParty = res.data.filter(e => !e.parentId)
-            this.optionsParty.map(t => this.addChild(t, res.data));
+            this.optionsParty = this.$arr2tree(res.data, {parent: "parentId"})
           }
         })
       }