From 3c496456b490eef0876e53513a3c3c542628eb50 Mon Sep 17 00:00:00 2001
From: zer0Black <694429613@qq.com>
Date: Sat, 16 Apr 2022 23:32:57 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=E3=80=91=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E7=BB=84=E4=BB=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=E6=97=B6=E5=80=99=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/jero/JImageUpload.vue |  2 +-
 jero-web/src/views/system/DepartUserList.vue  | 24 +++++++++----------
 .../src/views/system/modules/UserModal.vue    |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/jero-web/src/components/jero/JImageUpload.vue b/jero-web/src/components/jero/JImageUpload.vue
index 779821d1..410670e7 100644
--- a/jero-web/src/components/jero/JImageUpload.vue
+++ b/jero-web/src/components/jero/JImageUpload.vue
@@ -186,7 +186,7 @@
           path = ''
         }
         let arr = [];
-        if(!this.isMultiple){
+        if(!this.isMultiple && uploadFiles && uploadFiles.length > 0){
           arr.push(uploadFiles[uploadFiles.length-1].url)
         }else{
           for(let a=0;a<uploadFiles.length;a++){
diff --git a/jero-web/src/views/system/DepartUserList.vue b/jero-web/src/views/system/DepartUserList.vue
index 29921e04..61394f94 100644
--- a/jero-web/src/views/system/DepartUserList.vue
+++ b/jero-web/src/views/system/DepartUserList.vue
@@ -51,13 +51,13 @@
   import DeptUserInfo from './modules/DeptUserInfo'
   import { queryMyDepartTreeList, searchByKeywords } from '@/api/api'
   import { JeroListMixin } from '@/mixins/JeroListMixin'
-  import DeptRoleInfo from './modules/DeptRoleInfo'
+  // import DeptRoleInfo from './modules/DeptRoleInfo'
 
   export default {
     name: 'DepartUserList',
     mixins: [JeroListMixin],
     components: {
-      DeptRoleInfo,
+      // DeptRoleInfo,
       DeptBaseInfo,
       DeptUserInfo,
     },
@@ -106,13 +106,13 @@
       loadData() {
         this.refresh();
       },
-      // clearSelectedDepartKeys() {
-      //   this.checkedKeys = [];
-      //   this.selectedKeys = [];
-      //   this.currentDeptId = '';
-      //   this.$refs.DeptUserInfo.currentDeptId='';
-      //   this.$refs.DeptRoleInfo.currentDeptId='';
-      // },
+      clearSelectedDepartKeys() {
+        this.checkedKeys = [];
+        this.selectedKeys = [];
+        this.currentDeptId = '';
+        this.$refs.DeptUserInfo.currentDeptId='';
+        // this.$refs.DeptRoleInfo.currentDeptId='';
+      },
       loadTree() {
         var that = this
         that.treeData = []
@@ -185,7 +185,7 @@
 
         this.$refs.DeptBaseInfo.open(record);
         this.$refs.DeptUserInfo.open(record);
-        this.$refs.DeptRoleInfo.open(record);
+        // this.$refs.DeptRoleInfo.open(record);
         // }
         // else {
         //   this.checkedKeys = [];
@@ -205,8 +205,8 @@
         this.$refs.DeptBaseInfo.open(record);
         this.$refs.DeptUserInfo.onClearSelected();
         this.$refs.DeptUserInfo.open(record);
-        this.$refs.DeptRoleInfo.onClearSelected();
-        this.$refs.DeptRoleInfo.open(record);
+        // this.$refs.DeptRoleInfo.onClearSelected();
+        // this.$refs.DeptRoleInfo.open(record);
       },
     },
     created() {
diff --git a/jero-web/src/views/system/modules/UserModal.vue b/jero-web/src/views/system/modules/UserModal.vue
index 325fcaf3..accaa21b 100644
--- a/jero-web/src/views/system/modules/UserModal.vue
+++ b/jero-web/src/views/system/modules/UserModal.vue
@@ -99,7 +99,7 @@
                           text="上传"
                           v-model="model.avatar"
                           :disabled="disableSubmit"
-                          number=1
+                          :number=1
                           accept='.png,.PNG,.jpg,.JPG'></j-image-upload>
         </a-form-model-item>