fix 开启多租户功能后，用户管理中用户只能分配webApp的角色

zlt-business/user-center/src/main/java/com/central/user/controller/SysRoleController.java

 package com.central.user.controller;
 
+import java.util.List;
 import java.util.Map;
 
 import lombok.extern.slf4j.Slf4j;
@@ -42,6 +43,17 @@ public class SysRoleController {
         return sysRoleService.findRoles(params);
     }
 
+    /**
+     * 用户管理查询所有角色
+     * @return
+     */
+    @ApiOperation(value = "后台管理查询角色")
+    @GetMapping("/allRoles")
+    public Result<List<SysRole>> findAll() {
+        List<SysRole> result = sysRoleService.findAll();
+        return Result.succeed(result);
+    }
+
     /**
      * 角色新增或者更新
      *

zlt-business/user-center/src/main/java/com/central/user/mapper/SysRoleMapper.java

@@ -15,4 +15,6 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface SysRoleMapper extends SuperMapper<SysRole> {
 	List<SysRole> findList(Page<SysRole> page, @Param("r") Map<String, Object> params);
+
+	List<SysRole> findAll();
 }

zlt-business/user-center/src/main/java/com/central/user/service/ISysRoleService.java

 package com.central.user.service;
 
+import java.util.List;
 import java.util.Map;
 
 import com.central.common.model.PageResult;
@@ -28,4 +29,10 @@ public interface ISysRoleService extends ISuperService<SysRole> {
 	 * @return Result
 	 */
 	Result saveOrUpdateRole(SysRole sysRole);
+
+	/**
+	 * 查询所有角色
+	 * @return
+	 */
+	List<SysRole> findAll();
 }

zlt-business/user-center/src/main/java/com/central/user/service/impl/SysRoleServiceImpl.java

@@ -75,4 +75,9 @@ public class SysRoleServiceImpl extends SuperServiceImpl<SysRoleMapper, SysRole>
         }
         return Result.succeed("操作成功");
     }
+
+    @Override
+    public List<SysRole> findAll() {
+        return baseMapper.findAll();
+    }
 }

zlt-business/user-center/src/main/resources/application.yml

@@ -32,4 +32,6 @@ zlt:
     ignoreTables:
       - sys_user
       - sys_role_user
-      - sys_role_menu
\ No newline at end of file
+      - sys_role_menu
+    ignoreSqls:
+      - com.central.user.mapper.SysRoleMapper.findAll
\ No newline at end of file

zlt-business/user-center/src/main/resources/mapper/SysRoleMapper.xml

@@ -2,6 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.central.user.mapper.SysRoleMapper">
+	<sql id="Column_List">
+			id,
+			code,
+			name,
+			create_time,
+			update_time,
+			tenant_id
+	</sql>
+
 	<sql id="where">
 		<where>
 			<if test="r.name != null and r.name != ''">
@@ -15,8 +24,15 @@
 	</sql>
 
 	<select id="findList" resultType="com.central.common.model.SysRole">
-		select * from sys_role t
+		select <include refid="Column_List"/>
+		from sys_role t
 		<include refid="where" />
-		order by t.id desc
+		order by t.create_time desc
+	</select>
+
+	<select id="findAll" resultType="com.central.common.model.SysRole">
+		select <include refid="Column_List"/>
+		from sys_role
+		order by create_time desc
 	</select>
 </mapper>
\ No newline at end of file

zlt-web/back-web/src/main/resources/static/pages/system/user_form.html

@@ -53,13 +53,13 @@
 
         // 获取所有角色
         layer.load(2);
-        admin.req('api-user/roles', {}, function (data) {
+        admin.req('api-user/allRoles', {}, function (data) {
             layer.closeAll('loading');
-            if (0 == data.code) {
+            if (0 == data.resp_code) {
                 // 渲染多选下拉框
                 var roleSelectData = new Array();
-                for (var i = 0; i < data.data.length; i++) {
-                    roleSelectData.push({name: data.data[i].name, value: data.data[i].id});
+                for (var i = 0; i < data.datas.length; i++) {
+                    roleSelectData.push({name: data.datas[i].name, value: data.datas[i].id});
                 }
                 formSelects.data('roleId', 'local', {arr: roleSelectData});