修改获取当前登录用户管理的角色列表接口

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/RoleMapper.java

@@ -24,5 +24,5 @@ public interface RoleMapper extends BaseMapper<Role> {
      */
     IPage<GetRolePageDTO> getRolePage(@Param("getRolePageVO") GetRolePageVO getRolePageVO);
 
-    List<GetCreateRoleDTO> getCreateRoles(@Param("creator") long creator);
+    List<GetCreateRoleDTO> getCreateRoles(@Param("creator") Long creator,@Param("softwareId") Long softwareId);
 }

dblayer-mbg/src/main/resources/mapper/RoleMapper.xml

@@ -23,14 +23,23 @@
         </if>
     </select>
     <select id="getCreateRoles" resultType="com.lantone.common.dto.GetCreateRoleDTO">
-        SELECT
+        SELECT DISTINCT
             r.id,
-            r.name
+            r.`name`
         FROM
-            sys_role r
+            sys_role r,
+            sys_role_software_menu rsm,
+         sys_software_menu sm
         WHERE
             r.is_deleted = 'N'
+        AND rsm.is_deleted = 'N'
+        AND sm.is_deleted = 'N'
         AND r.`status` = '1'
+        AND rsm.role_id = r.id
+        AND rsm.software_menu_id = sm.id
+        <if test="softwareId!=null">
+            AND sm.software_id = #{softwareId}
+        </if>
         AND r.creator = #{creator}
     </select>
 </mapper>

security-center/src/main/java/com/lantone/security/facade/RoleManagementFacade.java

@@ -478,9 +478,8 @@ public class RoleManagementFacade {
      * @Description获取当前登录用户管理的角色列表
      * @Return java.util.List<com.lantone.common.dto.GetCreateRoleDTO>
      */
-    public List<GetCreateRoleDTO> getCreateRoles() {
-
-        return roleFacade.getBaseMapper().getCreateRoles(SysUserUtils.getCurrentPrincipleId());
+    public List<GetCreateRoleDTO> getCreateRoles(Long softwareId) {
+        return roleFacade.getBaseMapper().getCreateRoles(SysUserUtils.getCurrentPrincipleId(),softwareId);
     }
 
     /**

security-center/src/main/java/com/lantone/security/web/RoleManagementController.java

@@ -89,10 +89,11 @@ public class RoleManagementController {
         return CommonResult.success(roleManagementFacade.getUserMenuResourceTree(type));
     }
 
-    @ApiOperation(value = "获取当前登录用户管理的角色列表 [by:songxl]")
+    @ApiOperation(value = "获取当前登录用户管理的角色列表 [by:songxl]",
+            notes = "softwareId:系统id 添加用户时获取的角色softwareId为空；添加数据权限角色的softwareId为选择的系统id")
     @PostMapping("/getCreateRoles")
-    public CommonResult<List<GetCreateRoleDTO>> getCreateRoles() {
-        return CommonResult.success(roleManagementFacade.getCreateRoles());
+    public CommonResult<List<GetCreateRoleDTO>> getCreateRoles(@RequestParam Long softwareId) {
+        return CommonResult.success(roleManagementFacade.getCreateRoles(softwareId));
     }
 
     @ApiOperation(value = "获取当前登录用户的显示的菜单列表 [by:songxl]")