diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/controller/ElderInfoController.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/controller/ElderInfoController.java index 14ab6bf1..ae5b73fe 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/controller/ElderInfoController.java +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/controller/ElderInfoController.java @@ -85,10 +85,11 @@ public class ElderInfoController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(nuBizCustomerInfo, req.getParameterMap()); Page page = new Page(pageNo, pageSize); if ("zz".equals(nuBizCustomerInfo.getQueryModifyType())) { - queryWrapper.eq("elder_modify_status","1"); - } - if ("jhr".equals(nuBizCustomerInfo.getQueryModifyType())) { - queryWrapper.eq("guardian_modify_status","1"); + queryWrapper.eq("elder_modify_status", "1"); + } else if ("jhr".equals(nuBizCustomerInfo.getQueryModifyType())) { + queryWrapper.eq("guardian_modify_status", "1"); + } else { + queryWrapper.and(c -> c.eq("elder_modify_status", "1").or().eq("guardian_modify_status", "1")); } IPage pageList = nuBizCustomerInfoService.page(page, queryWrapper); return Result.OK(pageList);