From d3ea23d1adcf79a0d4a0c4c16bc2123cabebcf2a Mon Sep 17 00:00:00 2001 From: lxd <1004405501@qq.com> Date: Fri, 18 Jul 2025 17:04:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=A8=E6=80=81=E5=BF=83?= =?UTF-8?q?=E7=94=B5=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84=E6=9C=BA=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/system/dal/mysql/ecgdata/ecgdataMapper.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/ecgdata/ecgdataMapper.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/ecgdata/ecgdataMapper.java index 895f482..6b6e8ad 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/ecgdata/ecgdataMapper.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/ecgdata/ecgdataMapper.java @@ -30,12 +30,16 @@ public interface ecgdataMapper extends BaseMapperX { .eqIfPresent(ecgdataDO::getDurationseconds, reqVO.getDurationseconds()) .eqIfPresent(ecgdataDO::getReportgenerated, reqVO.getReportgenerated()) .eqIfPresent(ecgdataDO::getSuperiorrequest, reqVO.getSuperiorrequest()) - .eqIfPresent(ecgdataDO::getOrgid, reqVO.getOrgid()) + // .eqIfPresent(ecgdataDO::getOrgid, reqVO.getOrgid()) .likeIfPresent(ecgdataDO::getOrgname, reqVO.getOrgname()) - .eqIfPresent(ecgdataDO::getManagerorg, reqVO.getManagerorg()) + // .eqIfPresent(ecgdataDO::getManagerorg, reqVO.getManagerorg()) .eqIfPresent(ecgdataDO::getStatus, reqVO.getStatus()) .betweenIfPresent(ecgdataDO::getCreatetime, reqVO.getCreatetime()) .betweenIfPresent(ecgdataDO::getUpdatetime, reqVO.getUpdatetime()) + .and(wrapper -> wrapper + .eq(ecgdataDO::getOrgid, reqVO.getOrgid()) + .or() + .eq(ecgdataDO::getManagerorg, reqVO.getOrgid())) .orderByDesc(ecgdataDO::getId)); }