yangjun
/
nursing_unit_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_java

This commit is contained in:
yangjun 2026-01-30 09:56:47 +08:00
parent c1aa3777b5 cfdbef1099
commit 4c1ee07aee
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/controller/ElderInfoController.java
View File

@ -85,10 +85,11 @@ public class ElderInfoController extends JeecgController<ElderInfo, IElderInfoSe
QueryWrapper<ElderInfo> queryWrapper = QueryGenerator.initQueryWrapper(nuBizCustomerInfo, req.getParameterMap()); QueryWrapper<ElderInfo> queryWrapper = QueryGenerator.initQueryWrapper(nuBizCustomerInfo, req.getParameterMap());
Page<ElderInfo> page = new Page<ElderInfo>(pageNo, pageSize); Page<ElderInfo> page = new Page<ElderInfo>(pageNo, pageSize);
if ("zz".equals(nuBizCustomerInfo.getQueryModifyType())) { if ("zz".equals(nuBizCustomerInfo.getQueryModifyType())) {
queryWrapper.eq("elder_modify_status","1"); queryWrapper.eq("elder_modify_status", "1");
} } else if ("jhr".equals(nuBizCustomerInfo.getQueryModifyType())) {
if ("jhr".equals(nuBizCustomerInfo.getQueryModifyType())) { queryWrapper.eq("guardian_modify_status", "1");
queryWrapper.eq("guardian_modify_status","1"); } else {
queryWrapper.and(c -> c.eq("elder_modify_status", "1").or().eq("guardian_modify_status", "1"));
} }
IPage<ElderInfo> pageList = nuBizCustomerInfoService.page(page, queryWrapper); IPage<ElderInfo> pageList = nuBizCustomerInfoService.page(page, queryWrapper);
return Result.OK(pageList); return Result.OK(pageList);