diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/RoleTemplateController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/RoleTemplateController.java index f84bb6cb7..28e3a19ec 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/RoleTemplateController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/RoleTemplateController.java @@ -48,8 +48,8 @@ public class RoleTemplateController { * 列表 */ @GetMapping("/list") - public CzgResult> list(@RequestParam(required = false) Long pid) { - return CzgResult.success(roleTemplateService.listInfo(pid)); + public CzgResult> list(@RequestParam(required = false) Long pid, @RequestParam(required = false) Integer isEnable) { + return CzgResult.success(roleTemplateService.listInfo(pid, isEnable)); } } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/SysRoleTemplateService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/SysRoleTemplateService.java index 6d5298c09..2e420e46c 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/SysRoleTemplateService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/SysRoleTemplateService.java @@ -16,7 +16,7 @@ public interface SysRoleTemplateService extends IService { Boolean saveInfo(RoleTemplateDTO dto); - List listInfo(Long pid); + List listInfo(Long pid, Integer isEnable); Boolean editInfo(RoleTemplateDTO dto); } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleTemplateServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleTemplateServiceImpl.java index 17b15165d..1e7d9960d 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleTemplateServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleTemplateServiceImpl.java @@ -43,8 +43,11 @@ public class SysRoleTemplateServiceImpl extends ServiceImpl listInfo(Long pid) { - QueryWrapper queryWrapper = new QueryWrapper().eq(SysRoleTemplate::getPid, pid).orderBy(SysRoleTemplate::getSort, false); + public List listInfo(Long pid, Integer isEnable) { + QueryWrapper queryWrapper = new QueryWrapper() + .eq(SysRoleTemplate::getPid, pid) + .eq(SysRoleTemplate::getIsEnable, isEnable) + .orderBy(SysRoleTemplate::getSort, false); List list = list(queryWrapper); // 转成 map,便于通过 id 找节点