add: 增加通过组织机构查询其数据权限列表

@@ -65,6 +65,17 @@ public class RoleController {
         return i==1 ? new ResultJson("200","设置权限成功") :new ResultJson("500","设置权限失败");
     }
 
+    /**
+     * 获取角色的的数据权限
+     * @return
+     */
+    @LogAnnotation(moduleName = "获取角色的的数据权限",operate = "获取角色的的数据权限")
+    @PostMapping("/roleDataPermGet")
+    public ResultJson roleDataPermGet(@RequestBody RoleDataPermission roleDataPermission){
+        RoleDataPermission permissions = roleService.getRoleDataPermissoin(roleDataPermission);
+        return new ResultJson("200","获取权限列表成功",permissions);
+    }
+
     @LogAnnotation(moduleName = "岗位/角色管理",operate = "岗位/角色修改")
     @PutMapping("/edit")
     @ResponseBody

@@ -15,6 +15,8 @@ public interface RoleDataPermissionDao {
 
     RoleDataPermission selectByPrimaryKey(Integer id);
 
+    RoleDataPermission getRoleDataPerms(Integer id);
+
     int updateByPrimaryKeySelective(RoleDataPermission record);
 
     int updateByPrimaryKey(RoleDataPermission record);

@@ -19,5 +19,7 @@ public class RoleDataPermission implements Serializable {
 
     private List<Integer> permissionIds;
 
+    private List<DataPermission> dataPermissions;
+
     private static final long serialVersionUID = 1L;
 }

@@ -20,6 +20,8 @@ public interface RoleService {
 
     int setRoleDataPermissoin(RoleDataPermission record);
 
+    RoleDataPermission getRoleDataPermissoin(RoleDataPermission record);
+
     int updateByPrimaryKeySelective(ROLE role);
 
     int deleteByPrimaryKey(Integer departmentId);

@@ -153,6 +153,12 @@ public class RoleServiceImp implements RoleService{
     }
 
     @Override
+    public RoleDataPermission getRoleDataPermissoin(RoleDataPermission record) {
+        RoleDataPermission roleDataPerms = roleDataPermissionDao.getRoleDataPerms(record.getRoleId());
+        return roleDataPerms;
+    }
+
+    @Override
     public int updateByPrimaryKeySelective(ROLE company) {
         return roleMapper.updateByPrimaryKeySelective(company);
     }

@@ -6,6 +6,12 @@
     <result column="role_id" jdbcType="INTEGER" property="roleId" />
     <result column="permission_id" jdbcType="INTEGER" property="permissionId" />
   </resultMap>
+  <resultMap id="PermissionResultMap" type="com.tianbo.warehouse.model.RoleDataPermission" extends="BaseResultMap">
+    <collection javaType="java.util.ArrayList" ofType="com.tianbo.warehouse.model.DataPermission" property="dataPermissions">
+      <result column="data_perm_id" jdbcType="INTEGER" property="data_perm_id" />
+      <result column="perm_name" jdbcType="VARCHAR" property="perm_name" />
+    </collection>
+  </resultMap>
   <sql id="Base_Column_List">
     id, role_id, permission_id
   </sql>
@@ -15,6 +21,28 @@
     from role_data_permission
     where id = #{id,jdbcType=INTEGER}
   </select>
+  <select id="getRoleDataPerms" parameterType="java.lang.Integer" resultMap="PermissionResultMap">
+    SELECT
+      t.id,
+      t.role_id,
+      t.permission_id,
+      dp.data_perm_id,
+      dp.perm_name
+    FROM
+      (
+      SELECT
+          id,
+          role_id,
+          permission_id
+      FROM
+          role_data_permission rdp
+      WHERE
+          role_id = #{roleId,jdbcType=INTEGER}
+      ) t
+      LEFT JOIN data_permission dp
+      ON t.permission_id = dp.data_perm_id
+	ORDER BY dp.perm_keyword,dp.perm_sort
+  </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
     delete from role_data_permission
     where id = #{id,jdbcType=INTEGER}