tieshengkeji/tiesheng-springboot
1
1
Fork 0
Code Pull Requests Actions Packages Releases Activity

feat；增加角色模块

Browse Source
This commit is contained in:
曾文豪
2024-06-25 18:51:29 +08:00
parent a10b57f6fc
commit aee4fa86f6
3 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

26
springboot-role/src/main/resources/mapper/CoreRoleUserMapper.xml
View File

@@ -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
from core_role_user
where type = 'menu'
and user_id = #{userId}
where is_open = 1
and is_deleted = 0
and
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
from core_role_user cru
left join core_role_group_rx crgr on crgr.group_id = cru.type_id
where type = 'job'
and user_id = #{userId}
select crgr.menu_id
from core_role_user cru
left join core_role_group_rx crgr on crgr.group_id = cru.type_id
where type = 'job'
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>