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

@@ -69,7 +69,7 @@ public class RoleController {
      * 获取角色的的数据权限
      * @return
      */
-    @LogAnnotation(moduleName = "获取角色的的数据权限",operate = "获取角色的的数据权限")
+//    @LogAnnotation(moduleName = "获取角色的的数据权限",operate = "获取角色的的数据权限")
     @PostMapping("/roleDataPermGet")
     public ResultJson roleDataPermGet(@RequestBody RoleDataPermission roleDataPermission){
         RoleDataPermission permissions = roleService.getRoleDataPermissoin(roleDataPermission);

@@ -6,26 +6,26 @@
     <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 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>-->
+  <resultMap id="PermissionResultMap" type="com.tianbo.warehouse.model.RoleDataPermission">
+    <result column="role_id" jdbcType="INTEGER" property="roleId" />
+    <collection property="dataPermissions" ofType="com.tianbo.warehouse.model.DataPermission" resultMap="DataPermissionResultMap"/>
+  </resultMap>
+  <resultMap id="DataPermissionResultMap" type="com.tianbo.warehouse.model.DataPermission">
+    <result column="data_perm_id" property="data_perm_id" />
+    <result column="perm_name" property="perm_name" />
   </resultMap>
   <sql id="Base_Column_List">
     id, role_id, permission_id
   </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    select
-    <include refid="Base_Column_List" />
-    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
@@ -41,8 +41,15 @@
       ) t
       LEFT JOIN data_permission dp
       ON t.permission_id = dp.data_perm_id
-	ORDER BY dp.perm_keyword,dp.perm_sort
+-- 	ORDER BY dp.perm_keyword,dp.perm_sort
   </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from role_data_permission
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
     delete from role_data_permission
     where id = #{id,jdbcType=INTEGER}