朱兆平 / spring cloud基础开发框架 · 提交

转到一个项目

作者 朱兆平
提交 a67baf131f667ed3c123bbfa921f638b1364b785 1 个父辈 4706472a

bug-fix: 增加通过组织机构ID查询其数据权限列表

内嵌 并排对比
正在显示 2 个修改的文件 包含 22 行增加 和 15 行删除
@@ -69,7 +69,7 @@ public class RoleController { @@ -69,7 +69,7 @@ public class RoleController {
69 * 获取角色的的数据权限 69 * 获取角色的的数据权限
70 * @return 70 * @return
71 */ 71 */
72 - @LogAnnotation(moduleName = "获取角色的的数据权限",operate = "获取角色的的数据权限") 72 +// @LogAnnotation(moduleName = "获取角色的的数据权限",operate = "获取角色的的数据权限")
73 @PostMapping("/roleDataPermGet") 73 @PostMapping("/roleDataPermGet")
74 public ResultJson roleDataPermGet(@RequestBody RoleDataPermission roleDataPermission){ 74 public ResultJson roleDataPermGet(@RequestBody RoleDataPermission roleDataPermission){
75 RoleDataPermission permissions = roleService.getRoleDataPermissoin(roleDataPermission); 75 RoleDataPermission permissions = roleService.getRoleDataPermissoin(roleDataPermission);
@@ -6,26 +6,26 @@ @@ -6,26 +6,26 @@
6 <result column="role_id" jdbcType="INTEGER" property="roleId" /> 6 <result column="role_id" jdbcType="INTEGER" property="roleId" />
7 <result column="permission_id" jdbcType="INTEGER" property="permissionId" /> 7 <result column="permission_id" jdbcType="INTEGER" property="permissionId" />
8 </resultMap> 8 </resultMap>
9 - <resultMap id="PermissionResultMap" type="com.tianbo.warehouse.model.RoleDataPermission" extends="BaseResultMap">  
10 - <collection javaType="java.util.ArrayList" ofType="com.tianbo.warehouse.model.DataPermission" property="dataPermissions">  
11 - <result column="data_perm_id" jdbcType="INTEGER" property="data_perm_id" />  
12 - <result column="perm_name" jdbcType="VARCHAR" property="perm_name" />  
13 - </collection> 9 +<!-- <resultMap id="PermissionResultMap" type="com.tianbo.warehouse.model.RoleDataPermission" extends="BaseResultMap">-->
  10 +<!-- <collection javaType="java.util.ArrayList" ofType="com.tianbo.warehouse.model.DataPermission" property="dataPermissions">-->
  11 +<!-- <result column="data_perm_id" jdbcType="INTEGER" property="data_perm_id" />-->
  12 +<!-- <result column="perm_name" jdbcType="VARCHAR" property="perm_name" />-->
  13 +<!-- </collection>-->
  14 +<!-- </resultMap>-->
  15 + <resultMap id="PermissionResultMap" type="com.tianbo.warehouse.model.RoleDataPermission">
  16 + <result column="role_id" jdbcType="INTEGER" property="roleId" />
  17 + <collection property="dataPermissions" ofType="com.tianbo.warehouse.model.DataPermission" resultMap="DataPermissionResultMap"/>
  18 + </resultMap>
  19 + <resultMap id="DataPermissionResultMap" type="com.tianbo.warehouse.model.DataPermission">
  20 + <result column="data_perm_id" property="data_perm_id" />
  21 + <result column="perm_name" property="perm_name" />
14 </resultMap> 22 </resultMap>
15 <sql id="Base_Column_List"> 23 <sql id="Base_Column_List">
16 id, role_id, permission_id 24 id, role_id, permission_id
17 </sql> 25 </sql>
18 - <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">  
19 - select  
20 - <include refid="Base_Column_List" />  
21 - from role_data_permission  
22 - where id = #{id,jdbcType=INTEGER}  
23 - </select>  
24 <select id="getRoleDataPerms" parameterType="java.lang.Integer" resultMap="PermissionResultMap"> 26 <select id="getRoleDataPerms" parameterType="java.lang.Integer" resultMap="PermissionResultMap">
25 SELECT 27 SELECT
26 - t.id,  
27 t.role_id, 28 t.role_id,
28 - t.permission_id,  
29 dp.data_perm_id, 29 dp.data_perm_id,
30 dp.perm_name 30 dp.perm_name
31 FROM 31 FROM
@@ -41,8 +41,15 @@ @@ -41,8 +41,15 @@
41 ) t 41 ) t
42 LEFT JOIN data_permission dp 42 LEFT JOIN data_permission dp
43 ON t.permission_id = dp.data_perm_id 43 ON t.permission_id = dp.data_perm_id
44 - ORDER BY dp.perm_keyword,dp.perm_sort 44 +-- ORDER BY dp.perm_keyword,dp.perm_sort
45 </select> 45 </select>
  46 + <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
  47 + select
  48 + <include refid="Base_Column_List" />
  49 + from role_data_permission
  50 + where id = #{id,jdbcType=INTEGER}
  51 + </select>
  52 +
46 <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer"> 53 <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
47 delete from role_data_permission 54 delete from role_data_permission
48 where id = #{id,jdbcType=INTEGER} 55 where id = #{id,jdbcType=INTEGER}