feat；增加角色模块

springboot-role/src/main/java/com/tiesheng/role/controller/RoleController.java

@@ -264,8 +264,6 @@ public class RoleController {
     @GetMapping("/owner/menu")
     public ApiResp<String> ownerMenu(@Valid ServiceDTO dto) {
 
-
-
         return ApiResp.respOK("");
     }
 

springboot-role/src/main/java/com/tiesheng/role/service/CoreRoleService.java

@@ -62,10 +62,8 @@ public class CoreRoleService extends TsServiceBase<CoreRoleGroupMapper, CoreRole
      *
      * @return
      */
-    public List<CoreRoleAuthority> getAllOwnerMenus(String userId,String roleId) {
+    public List<CoreRoleAuthority> getAllOwnerMenus(String userId, String roleId) {
-        List<CoreRoleAuthority> authority = coreRoleUserMapper.getAllAuthorityByUserId(userId, "");
+        List<CoreRoleAuthority> authority = coreRoleUserMapper.getAllAuthorityByUserId(userId, roleId);
-
-
 
 
         return authority;

springboot-role/src/main/resources/mapper/CoreRoleUserMapper.xml

@@ -35,18 +35,23 @@
   <select id="getAllAuthorityByUserId" resultType="com.tiesheng.role.pojos.dao.CoreRoleAuthority">
       select *
       from core_role_authority
-      where id in (select type_id
+      where is_open = 1
-                   from core_role_user
+        and is_deleted = 0
-                   where type = 'menu'
+        and
-                     and user_id = #{userId}
+      id in (select type_id
+             from core_role_user
+             where type = 'menu'
+               and user_id = #{userId}
+               and is_deleted = 0
 
-                   union
+             union
 
-                   select crgr.menu_id
+             select crgr.menu_id
-                   from core_role_user cru
+             from core_role_user cru
-                            left join core_role_group_rx crgr on crgr.group_id = cru.type_id
+                      left join core_role_group_rx crgr on crgr.group_id = cru.type_id
-                   where type = 'job'
+             where type = 'job'
-                     and user_id = #{userId}
+               and user_id = #{userId}
+               and cru.is_deleted = 0
 
 
       <if test="roleId != null and roleId != ''">
@@ -57,6 +62,7 @@
           where group_id = #{roleId}
       </if>
       )
+      order by sort
   </select>
 
 </mapper>