diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/controller/OrgApplyInfoController.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/controller/OrgApplyInfoController.java index aad9baa..0922b36 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/controller/OrgApplyInfoController.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/controller/OrgApplyInfoController.java @@ -78,7 +78,6 @@ public class OrgApplyInfoController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(orgApplyInfo, req.getParameterMap(), customeRuleMap); - queryWrapper.in("status", new String[]{"1", "2", "3"}); Page page = new Page(pageNo, pageSize); if (StringUtils.isNotBlank(orgApplyInfo.getTitle())) { String value = orgApplyInfo.getTitle(); @@ -88,36 +87,6 @@ public class OrgApplyInfoController extends JeecgController> modifyLlist(OrgApplyInfo orgApplyInfo, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { - // 自定义查询规则 - Map customeRuleMap = new HashMap<>(); - // 自定义多选的查询规则为:LIKE_WITH_OR - customeRuleMap.put("status", QueryRuleEnum.LIKE_WITH_OR); - customeRuleMap.put("izEntry", QueryRuleEnum.LIKE_WITH_OR); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(orgApplyInfo, req.getParameterMap(), customeRuleMap); - queryWrapper.in("status", new String[]{"4", "5"}); - Page page = new Page(pageNo, pageSize); - if (StringUtils.isNotBlank(orgApplyInfo.getTitle())) { - String value = orgApplyInfo.getTitle(); - queryWrapper.and(c -> c.like("com_name", value).or().like("org_leader", value).or().like("org_leader_phone", value)); - } - IPage pageList = orgApplyInfoService.page(page, queryWrapper); - return Result.OK(pageList); - } /** * 添加