|
|
|
@ -84,12 +84,13 @@ public class SupPoliceService extends ServiceImpl<SupPoliceMapper, SupPolice> { |
|
|
|
queryWrapper.like(StrUtil.isNotBlank(param.getPhone()), "p.phone", StrUtil.trim(param.getPhone())); |
|
|
|
queryWrapper.like(StrUtil.isNotBlank(param.getPhone()), "p.phone", StrUtil.trim(param.getPhone())); |
|
|
|
|
|
|
|
|
|
|
|
if (StrUtil.isNotBlank(param.getDepartId())) { |
|
|
|
if (StrUtil.isNotBlank(param.getDepartId())) { |
|
|
|
if (Objects.nonNull(param.getDepartBranch()) && param.getDepartBranch()) { |
|
|
|
// if (Objects.nonNull(param.getDepartBranch()) && param.getDepartBranch()) {
|
|
|
|
List<String> orgIds = departService.getAllNodeIds(param.getDepartId()); |
|
|
|
List<String> orgIds = departService.getAllNodeIds(param.getDepartId()); |
|
|
|
queryWrapper.in("p.org_id", orgIds); |
|
|
|
queryWrapper.in("p.org_id", orgIds); |
|
|
|
} else { |
|
|
|
param.setSize(1000L); |
|
|
|
queryWrapper.eq("p.org_id", param.getDepartId()); |
|
|
|
// } 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())); |
|
|
|
queryWrapper.apply(StrUtil.isNotBlank(param.getRoleId()), String.format("find_in_set( '%s', u.role_id) > 0", param.getRoleId())); |
|
|
|
|