From cfdbef109967c7bdabc6cc5ecc431e1d3c7578d2 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Thu, 29 Jan 2026 09:59:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=95=BF=E8=80=85=E3=80=81?= =?UTF-8?q?=E7=9B=91=E6=8A=A4=E4=BA=BA=E5=8F=98=E6=9B=B4=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=9A=E9=80=82=E9=85=8D=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E9=95=BF=E8=80=85=E4=BF=A1=E6=81=AF=E3=80=81=E7=9B=91=E6=8A=A4?= =?UTF-8?q?=E4=BA=BA=E4=BF=A1=E6=81=AF=E5=8F=98=E6=9B=B4=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elderinfo/controller/ElderInfoController.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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);