From fcf879d06fc6a819b16b5fa4939a76d01164cf6b Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Fri, 6 Nov 2020 09:39:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):?=
 =?UTF-8?q?=20=E7=94=A8=E4=BE=8B=E5=AF=BC=E5=87=BA=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/service/TestCaseService.java          | 17 ++++++++++++-----
 frontend/src/business/components/xpack          |  2 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
index 82c99bff35..ca463ab9b0 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
@@ -457,12 +457,19 @@ public class TestCaseService {
             if (t.getMethod().equals("manual")) {
                 String steps = t.getSteps();
                 String setp = "";
-                if (steps.contains("null") && !steps.contains("\"null\"")) {
-                    setp = steps.replace("null", "\"\"");
-                } else {
-                    setp = steps;
+                setp = steps;
+                JSONArray jsonArray = null;
+
+                //解决旧版本保存用例导出报错
+                try {
+                    jsonArray = JSON.parseArray(setp);
+                } catch (Exception e) {
+                    if (steps.contains("null") && !steps.contains("\"null\"")) {
+                        setp = steps.replace("null", "\"\"");
+                        jsonArray = JSON.parseArray(setp);
+                    }
                 }
-                JSONArray jsonArray = JSON.parseArray(setp);
+
                 for (int j = 0; j < jsonArray.size(); j++) {
                     int num = j + 1;
                     step.append(num + "." + jsonArray.getJSONObject(j).getString("desc") + "\n");
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index b9091a47b1..eb237fb6bf 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit b9091a47b197faef77c72b134b7cf604fe3209f0
+Subproject commit eb237fb6bfeba8d99e4db52450ae92f3cdd4ea33

From acaddcbe7a8a275349dd93d57bcd0813d43f6d68 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Mon, 16 Nov 2020 15:53:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E6=88=90=E5=91=98=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  3 +-
 .../base/mapper/ext/ExtUserRoleMapper.xml     | 12 ++++++--
 .../commons/constants/RoleConstants.java      |  1 +
 .../service/OrganizationService.java          |  3 +-
 .../resources/db/migration/V43__add_role.sql  |  2 ++
 .../organization/OrganizationMember.vue       |  5 ++++
 .../components/settings/system/User.vue       | 30 +++++++++++++++++++
 frontend/src/i18n/en-US.js                    |  1 +
 frontend/src/i18n/zh-CN.js                    |  1 +
 frontend/src/i18n/zh-TW.js                    |  1 +
 10 files changed, 54 insertions(+), 5 deletions(-)
 create mode 100644 backend/src/main/resources/db/migration/V43__add_role.sql

diff --git a/.gitignore b/.gitignore
index 832cb0b18e..165db4e885 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,4 +30,5 @@ target
 .settings
 .project
 .classpath
-.jython_cache
\ No newline at end of file
+.jython_cache
+qywx.json
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserRoleMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserRoleMapper.xml
index 87fb487b28..3a53df48e8 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserRoleMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserRoleMapper.xml
@@ -49,8 +49,16 @@
 
     <select id="getOrgMemberList" resultType="io.metersphere.base.domain.User">
         SELECT DISTINCT * FROM (
-        SELECT `user`.* FROM user_role JOIN `user` ON user_role.user_id = `user`.id
-        WHERE user_role.source_id = #{orgMember.organizationId}
+        SELECT `user`.*
+        FROM user_role JOIN `user`
+        ON user_role.user_id = `user`.id
+        WHERE user_role.source_id in
+        (
+          SELECT id FROM workspace w
+          WHERE w.organization_id = #{orgMember.organizationId}
+          UNION
+          SELECT #{orgMember.organizationId} AS id FROM dual
+        )
         <if test="orgMember.name != null">
             AND `user`.name like CONCAT('%', #{orgMember.name},'%')
         </if>
diff --git a/backend/src/main/java/io/metersphere/commons/constants/RoleConstants.java b/backend/src/main/java/io/metersphere/commons/constants/RoleConstants.java
index 19d254b23c..adb585b0d0 100644
--- a/backend/src/main/java/io/metersphere/commons/constants/RoleConstants.java
+++ b/backend/src/main/java/io/metersphere/commons/constants/RoleConstants.java
@@ -3,6 +3,7 @@ package io.metersphere.commons.constants;
 public class RoleConstants {
     public final static String ADMIN = "admin";
     public final static String ORG_ADMIN = "org_admin";
+    public final static String ORG_MEMBER = "org_member";
     public final static String TEST_VIEWER = "test_viewer";
     public final static String TEST_MANAGER = "test_manager";
     public final static String TEST_USER = "test_user";
diff --git a/backend/src/main/java/io/metersphere/service/OrganizationService.java b/backend/src/main/java/io/metersphere/service/OrganizationService.java
index a88e4f7b31..71f89263d4 100644
--- a/backend/src/main/java/io/metersphere/service/OrganizationService.java
+++ b/backend/src/main/java/io/metersphere/service/OrganizationService.java
@@ -171,12 +171,11 @@ public class OrganizationService {
         SessionUser sessionUser = SessionUtils.getUser();
         UserDTO user = userService.getUserDTO(sessionUser.getId());
         List<String> collect = user.getUserRoles().stream()
-                .filter(ur -> RoleConstants.ORG_ADMIN.equals(ur.getRoleId()))
+                .filter(ur -> RoleConstants.ORG_ADMIN.equals(ur.getRoleId()) || RoleConstants.ORG_MEMBER.equals(ur.getRoleId()))
                 .map(UserRole::getSourceId)
                 .collect(Collectors.toList());
         if (!collect.contains(organizationId)) {
             MSException.throwException(Translator.get("organization_does_not_belong_to_user"));
         }
-
     }
 }
diff --git a/backend/src/main/resources/db/migration/V43__add_role.sql b/backend/src/main/resources/db/migration/V43__add_role.sql
new file mode 100644
index 0000000000..7b6ba33c6f
--- /dev/null
+++ b/backend/src/main/resources/db/migration/V43__add_role.sql
@@ -0,0 +1,2 @@
+INSERT INTO role (id, name, description, type, create_time, update_time)
+VALUES ('org_member', '组织成员', NULL, NULL, unix_timestamp() * 1000, unix_timestamp() * 1000);
\ No newline at end of file
diff --git a/frontend/src/business/components/settings/organization/OrganizationMember.vue b/frontend/src/business/components/settings/organization/OrganizationMember.vue
index 1d8c718001..f18031d60f 100644
--- a/frontend/src/business/components/settings/organization/OrganizationMember.vue
+++ b/frontend/src/business/components/settings/organization/OrganizationMember.vue
@@ -165,6 +165,11 @@
           for (let i = 0; i < this.tableData.length; i++) {
             this.$get(url + "/" + encodeURIComponent(this.tableData[i].id), response => {
               let roles = response.data;
+              if (roles.length < 1) {
+                roles.push({
+                  id : "org_member",
+                });
+              }
               this.$set(this.tableData[i], "roles", roles);
             })
           }
diff --git a/frontend/src/business/components/settings/system/User.vue b/frontend/src/business/components/settings/system/User.vue
index 58f9ef44bc..8b0f40c74a 100644
--- a/frontend/src/business/components/settings/system/User.vue
+++ b/frontend/src/business/components/settings/system/User.vue
@@ -103,6 +103,21 @@
               </el-select>
             </el-form-item>
           </div>
+          <div v-if="role.id === 'org_member'">
+            <el-form-item :label="$t('organization.select_organization')"
+                          :prop="'roles.' + index + '.ids'"
+                          :rules="{required: true, message: $t('organization.select_organization'), trigger: 'change'}"
+            >
+              <el-select filterable v-model="role.ids" :placeholder="$t('organization.select_organization')" multiple>
+                <el-option
+                  v-for="item in form.orgList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </div>
           <div v-if="role.id === 'test_manager'">
             <el-form-item :label="$t('workspace.select')"
                           :prop="'roles.' + index + '.ids'"
@@ -214,6 +229,21 @@
               </el-select>
             </el-form-item>
           </div>
+          <div v-if="role.id === 'org_member'">
+            <el-form-item :label="$t('organization.select_organization')"
+                          :prop="'roles.' + index + '.ids'"
+                          :rules="{required: true, message: $t('organization.select_organization'), trigger: 'change'}"
+            >
+              <el-select filterable v-model="role.ids" :placeholder="$t('organization.select_organization')" multiple>
+                <el-option
+                  v-for="item in form.orgList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </div>
           <div v-if="role.id === 'test_manager'">
             <el-form-item :label="$t('workspace.select')"
                           :prop="'roles.' + index + '.ids'"
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index dfcd80d015..3261a6e836 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -336,6 +336,7 @@ export default {
     please_choose_role: 'Please Choose Role',
     admin: 'Admin',
     org_admin: 'Org_Admin',
+    org_member: 'Org Member',
     test_manager: 'Test Manager',
     test_user: 'Test User',
     test_viewer: 'Read-only User',
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 18ce960f57..1decfdd38b 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -335,6 +335,7 @@ export default {
     please_choose_role: '请选择角色',
     admin: '系统管理员',
     org_admin: '组织管理员',
+    org_member: '组织成员',
     test_manager: '测试经理',
     test_user: '测试人员',
     test_viewer: '只读用户',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index da33a1d4ca..897616a05d 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -337,6 +337,7 @@ export default {
     please_choose_role: '請選擇角色',
     admin: '系統管理員',
     org_admin: '組織管理員',
+    org_member: '組織成員',
     test_manager: '測試經理',
     test_user: '測試人員',
     test_viewer: '只讀用戶',