diff --git a/src/main/java/com/biutag/supervision/service/SupPoliceService.java b/src/main/java/com/biutag/supervision/service/SupPoliceService.java index 116c9d8..6503d3b 100644 --- a/src/main/java/com/biutag/supervision/service/SupPoliceService.java +++ b/src/main/java/com/biutag/supervision/service/SupPoliceService.java @@ -84,12 +84,13 @@ public class SupPoliceService extends ServiceImpl { queryWrapper.like(StrUtil.isNotBlank(param.getPhone()), "p.phone", StrUtil.trim(param.getPhone())); if (StrUtil.isNotBlank(param.getDepartId())) { - if (Objects.nonNull(param.getDepartBranch()) && param.getDepartBranch()) { +// if (Objects.nonNull(param.getDepartBranch()) && param.getDepartBranch()) { List orgIds = departService.getAllNodeIds(param.getDepartId()); queryWrapper.in("p.org_id", orgIds); - } else { - queryWrapper.eq("p.org_id", param.getDepartId()); - } + param.setSize(1000L); +// } else { +// queryWrapper.eq("p.org_id", param.getDepartId()); +// } } queryWrapper.apply(StrUtil.isNotBlank(param.getRoleId()), String.format("find_in_set( '%s', u.role_id) > 0", param.getRoleId()));