Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_java
This commit is contained in:
commit
4c1ee07aee
|
|
@ -86,9 +86,10 @@ public class ElderInfoController extends JeecgController<ElderInfo, IElderInfoSe
|
|||
Page<ElderInfo> page = new Page<ElderInfo>(pageNo, pageSize);
|
||||
if ("zz".equals(nuBizCustomerInfo.getQueryModifyType())) {
|
||||
queryWrapper.eq("elder_modify_status", "1");
|
||||
}
|
||||
if ("jhr".equals(nuBizCustomerInfo.getQueryModifyType())) {
|
||||
} 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<ElderInfo> pageList = nuBizCustomerInfoService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
|
|
|
|||
Loading…
Reference in New Issue