From ca3a38ab1a1015c3d4d0c69c85c8c3820e7a11e1 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 22 May 2020 17:47:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E8=A7=92=E8=89=B2=E5=87=BA=E7=8E=B0=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../metersphere/service/UserRoleService.java  |  4 +--
 .../io/metersphere/service/UserService.java   |  4 +--
 .../components/settings/system/User.vue       | 34 +++++++++----------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/service/UserRoleService.java b/backend/src/main/java/io/metersphere/service/UserRoleService.java
index a9d48fdf0c..2cdbb8963e 100644
--- a/backend/src/main/java/io/metersphere/service/UserRoleService.java
+++ b/backend/src/main/java/io/metersphere/service/UserRoleService.java
@@ -45,11 +45,11 @@ public class UserRoleService {
         for (int i = 0; i < collect.size(); i++) {
             Map<String, Object> map = new HashMap<>(2);
             map.put("id", collect.get(i));
-            map.put("Ids", new ArrayList<>());
+            map.put("ids", new ArrayList<>());
             for (int j = 0; j < userRoles.size(); j++) {
                 String role = userRoles.get(j).getRoleId();
                 if (StringUtils.equals(role, collect.get(i))) {
-                    List ids = (List) map.get("Ids");
+                    List ids = (List) map.get("ids");
                     ids.add(userRoles.get(j).getSourceId());
                 }
             }
diff --git a/backend/src/main/java/io/metersphere/service/UserService.java b/backend/src/main/java/io/metersphere/service/UserService.java
index 4a66cc868a..f96c460205 100644
--- a/backend/src/main/java/io/metersphere/service/UserService.java
+++ b/backend/src/main/java/io/metersphere/service/UserService.java
@@ -80,10 +80,10 @@ public class UserService {
                 userRole.setSourceId("adminSourceId");
                 userRoleMapper.insertSelective(userRole);
             } else {
-//                if (!map.keySet().contains("Ids")) {
+//                if (!map.keySet().contains("ids")) {
 //                    MSException.throwException(role + " no source id");
 //                }
-                List<String> list = (List<String>) map.get("Ids");
+                List<String> list = (List<String>) map.get("ids");
                 for (int j = 0; j < list.size(); j++) {
                     UserRole userRole1 = new UserRole();
                     userRole1.setId(UUID.randomUUID().toString());
diff --git a/frontend/src/business/components/settings/system/User.vue b/frontend/src/business/components/settings/system/User.vue
index 3a36fba15f..6e0bcebc91 100644
--- a/frontend/src/business/components/settings/system/User.vue
+++ b/frontend/src/business/components/settings/system/User.vue
@@ -87,10 +87,10 @@
           </el-form-item>
           <div v-if="role.id === 'org_admin'">
             <el-form-item label="选择组织"
-                          :prop="'roles.' + index + '.Ids'"
+                          :prop="'roles.' + index + '.ids'"
                           :rules="{required: true, message: '请选择组织', trigger: 'change'}"
             >
-              <el-select v-model="role.Ids" placeholder="选择组织" multiple>
+              <el-select v-model="role.ids" placeholder="选择组织" multiple>
                 <el-option
                   v-for="item in form.orgList"
                   :key="item.id"
@@ -102,10 +102,10 @@
           </div>
           <div v-if="role.id === 'test_manager'">
             <el-form-item label="选择工作空间"
-                          :prop="'roles.' + index + '.Ids'"
+                          :prop="'roles.' + index + '.ids'"
                           :rules="{required: true, message: '请选择工作空间', trigger: 'change'}"
             >
-              <el-select v-model="role.Ids" placeholder="选择工作空间" multiple>
+              <el-select v-model="role.ids" placeholder="选择工作空间" multiple>
                 <el-option
                   v-for="item in form.wsList"
                   :key="item.id"
@@ -117,10 +117,10 @@
           </div>
           <div v-if="role.id ==='test_user'">
             <el-form-item label="选择工作空间"
-                          :prop="'roles.' + index + '.Ids'"
+                          :prop="'roles.' + index + '.ids'"
                           :rules="{required: true, message: '请选择工作空间', trigger: 'change'}"
             >
-              <el-select v-model="role.Ids" placeholder="选择工作空间" multiple>
+              <el-select v-model="role.ids" placeholder="选择工作空间" multiple>
                 <el-option
                   v-for="item in form.wsList"
                   :key="item.id"
@@ -132,10 +132,10 @@
           </div>
           <div v-if="role.id ==='test_viewer'">
             <el-form-item label="选择工作空间"
-                          :prop="'roles.' + index + '.Ids'"
+                          :prop="'roles.' + index + '.ids'"
                           :rules="{required: true, message: '请选择工作空间', trigger: 'change'}"
             >
-              <el-select v-model="role.Ids" placeholder="选择工作空间" multiple>
+              <el-select v-model="role.ids" placeholder="选择工作空间" multiple>
                 <el-option
                   v-for="item in form.wsList"
                   :key="item.id"
@@ -181,7 +181,7 @@
                         :prop="'roles.' + index + '.id'"
                         :rules="{required: true, message: '请选择角色', trigger: 'change'}"
           >
-            <el-select v-model="role.id" placeholder="选择角色类型">
+            <el-select v-model="role.id" placeholder="选择角色类型" :disabled="!!role.id">
               <el-option
                 v-for="item in activeRole(role)"
                 :key="item.id"
@@ -194,10 +194,10 @@
           </el-form-item>
           <div v-if="role.id === 'org_admin'">
             <el-form-item label="选择组织"
-                          :prop="'roles.' + index + '.Ids'"
+                          :prop="'roles.' + index + '.ids'"
                           :rules="{required: true, message: '请选择组织', trigger: 'change'}"
             >
-              <el-select v-model="role.Ids" placeholder="选择组织" multiple>
+              <el-select v-model="role.ids" placeholder="选择组织" multiple>
                 <el-option
                   v-for="item in form.orgList"
                   :key="item.id"
@@ -209,10 +209,10 @@
           </div>
           <div v-if="role.id === 'test_manager'">
             <el-form-item label="选择工作空间"
-                          :prop="'roles.' + index + '.Ids'"
+                          :prop="'roles.' + index + '.ids'"
                           :rules="{required: true, message: '请选择工作空间', trigger: 'change'}"
             >
-              <el-select v-model="role.Ids" placeholder="选择工作空间" multiple>
+              <el-select v-model="role.ids" placeholder="选择工作空间" multiple>
                 <el-option
                   v-for="item in form.wsList"
                   :key="item.id"
@@ -224,10 +224,10 @@
           </div>
           <div v-if="role.id ==='test_user'">
             <el-form-item label="选择工作空间"
-                          :prop="'roles.' + index + '.Ids'"
+                          :prop="'roles.' + index + '.ids'"
                           :rules="{required: true, message: '请选择工作空间', trigger: 'change'}"
             >
-              <el-select v-model="role.Ids" placeholder="选择工作空间" multiple>
+              <el-select v-model="role.ids" placeholder="选择工作空间" multiple>
                 <el-option
                   v-for="item in form.wsList"
                   :key="item.id"
@@ -239,10 +239,10 @@
           </div>
           <div v-if="role.id ==='test_viewer'">
             <el-form-item label="选择工作空间"
-                          :prop="'roles.' + index + '.Ids'"
+                          :prop="'roles.' + index + '.ids'"
                           :rules="{required: true, message: '请选择工作空间', trigger: 'change'}"
             >
-              <el-select v-model="role.Ids" placeholder="选择工作空间" multiple>
+              <el-select v-model="role.ids" placeholder="选择工作空间" multiple>
                 <el-option
                   v-for="item in form.wsList"
                   :key="item.id"