czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

角色完善

Browse Source
This commit is contained in:
张松
2025-03-11 19:02:33 +08:00
parent aa00bacfca
commit f3d4aa2da8
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cash-api/account-server/src/main/java/com/czg/controller/admin/RoleController.java
View File

@@ -37,7 +37,7 @@ public class RoleController {
@SaAdminCheckPermission(value = "role:list", name = "角色列表")
@GetMapping("/list")
public CzgResult<Page<SysRole>> getList(PageDTO pageDTO, String key, String startTime, String endTime) {
return CzgResult.success(roleService.getList(pageDTO, key, startTime, endTime));
return CzgResult.success(roleService.getList(StpKit.USER.getShopId(), pageDTO, key, startTime, endTime));
}
/**

2
cash-common/cash-common-service/src/main/java/com/czg/account/service/SysRoleService.java
View File

@@ -19,7 +19,7 @@ public interface SysRoleService extends IService<SysRole> {
List<SysRole> getByUserId(Long id);
Page<SysRole> getList(PageDTO pageDTO, String key, String startTime, String endTime);
Page<SysRole> getList(Long shopId, PageDTO pageDTO, String key, String startTime, String endTime);
Boolean add(RoleAddDTO roleAddDTO);

4
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java
View File

@@ -46,8 +46,8 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> imp
}
@Override
public Page<SysRole> getList(PageDTO pageDTO, String key, String startTime, String endTime) {
QueryWrapper queryWrapper = new QueryWrapper();
public Page<SysRole> getList(Long shopId, PageDTO pageDTO, String key, String startTime, String endTime) {
QueryWrapper queryWrapper = new QueryWrapper().eq(SysRole::getShopId, shopId);
if (!StpKit.USER.isAdmin()) {
queryWrapper.eq(SysRole::getCreateUserId, StpKit.USER.getLoginIdAsLong());
}