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)); }