refactor(系统设置): 组织接口添加管理员标识

backend/framework/sdk/src/main/resources/i18n/system_en_US.properties

@@ -149,7 +149,8 @@ organization_user_role_permission_error=no organization user role permission
 user_role_exist=User role already exists
 user_role_not_exist=User role not exist
 user_role_not_edit=User role can not edit
-at_least_one_user_role_require=at least one user role require
+at_least_one_user_role_require=At least one user role require
+default_organization_not_allow_delete=Default organization not allow delete
 # plugin
 plugin.id.not_blank=id cannot be empty
 plugin.id.length_range=id length must be between {min} and {max}

backend/framework/sdk/src/main/resources/i18n/system_zh_CN.properties

@@ -149,6 +149,7 @@ user_role_exist=用户组已存在
 user_role_not_exist=用户组不存在
 user_role_not_edit=用户组无法编辑
 at_least_one_user_role_require=至少需要一个用户组
+default_organization_not_allow_delete=默认组织无法删除
 # plugin
 plugin.id.not_blank=ID不能为空
 plugin.id.length_range=ID长度必须在{min}和{max}之间

backend/framework/sdk/src/main/resources/i18n/system_zh_TW.properties

@@ -149,6 +149,7 @@ user_role_exist=用戶組已存在
 user_role_not_exist=用戶組不存在
 user_role_not_edit=用戶組無法編輯
 at_least_one_user_role_require=至少需要一個用戶組
+default_organization_not_allow_delete=默認組織無法刪除
 # plugin
 plugin.id.not_blank=ID不能為空
 plugin.id.length_range=ID長度必須在{min}和{max}之间

backend/services/system-setting/src/main/java/io/metersphere/system/dto/OrganizationDTO.java

@@ -48,5 +48,5 @@ public class OrganizationDTO extends Organization {
      * 创建人是否是管理员
      */
     @Schema(description =  "创建人是否是管理员")
-    private boolean orgCreateUserIsAdmin;
+    private Boolean orgCreateUserIsAdmin;
 }

backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtOrganizationMapper.xml

@@ -28,7 +28,7 @@
     </update>
 
     <select id="listMember" resultType="io.metersphere.system.dto.UserExtend">
-        select temp.*, max(if(temp.role_id = 'org_admin', true, false))
+        select temp.*, max(if(temp.role_id = 'org_admin', true, false)) as adminFlag
         from (
             select u.*, urr.role_id
             from user_role_relation urr