From 2f30ee81d1658457481f04ec751568d85086505c Mon Sep 17 00:00:00 2001
From: chendaze <1824191732@qq.com>
Date: Mon, 15 Apr 2024 16:52:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=AF=B9=E5=BA=94bu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/admin/CustomerEdit.vue       | 2 +-
 src/views/system/modules/UserModal.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/admin/CustomerEdit.vue b/src/views/admin/CustomerEdit.vue
index 624f9e9..eb2c7a4 100644
--- a/src/views/admin/CustomerEdit.vue
+++ b/src/views/admin/CustomerEdit.vue
@@ -397,7 +397,7 @@
         :dataSource='deviceData'
       >
          <span slot='floorName' slot-scope='text, record'>
-              {{ record.buildName + record.roomName }}
+              {{ record.roomName?record.buildName + record.roomName:record.buildName }}
          </span>
       </a-table>
     </a-modal>
diff --git a/src/views/system/modules/UserModal.vue b/src/views/system/modules/UserModal.vue
index dbd1338..901d40f 100644
--- a/src/views/system/modules/UserModal.vue
+++ b/src/views/system/modules/UserModal.vue
@@ -261,7 +261,7 @@ export default {
       // 园区角色显示用户并且查询用户
       console.log('this.mdl.roleIds', this.mdl.roleIds)
       if (this.mdl.roleIds[0] == 5) {
-        this.selectUserShow = true
+        this.selectUserShow = false
       } else {
         // 隐藏用户搜索
         this.selectUserShow = false