diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java index 8df3a4d..cb75e27 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java @@ -71,8 +71,12 @@ public class SysRole extends BaseEntity /** * 所属公司ID */ + @JsonFormat(shape = JsonFormat.Shape.STRING) private Long companyId; + @JsonFormat(shape = JsonFormat.Shape.STRING) + private Long areaId; + /** 角色菜单权限 */ private Set permissions; @@ -232,6 +236,14 @@ public class SysRole extends BaseEntity this.companyId = companyId; } + public Long getAreaId() { + return areaId; + } + + public void setAreaId(Long areaId) { + this.areaId = areaId; + } + public Set getPermissions() { return permissions; diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java index 359d6bc..15c3da9 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java @@ -78,6 +78,7 @@ public class SysRoleServiceImpl implements ISysRoleService role.setRoleKey(str); } role.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); + role.setAreaId(SecurityUtils.getLoginUser().getSysUser().getAreaId()); return roleMapper.selectRoleList(role); } diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml index 1a8ccc1..f4419fe 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -44,6 +44,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND r.company_id = #{companyId} + + AND r.area_id = #{areaId} + AND r.status = #{status}