From 030c2005d8b303da9721d01b5fd070113c855451 Mon Sep 17 00:00:00 2001 From: lxd <1004405501@qq.com> Date: Wed, 16 Oct 2024 10:27:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E6=9F=A5=E8=AF=A2=E4=B8=8A?= =?UTF-8?q?=E7=BA=A7=E6=9C=BA=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dal/mysql/patientexamlist/PatientexamlistMapper.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/dal/mysql/patientexamlist/PatientexamlistMapper.java b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/dal/mysql/patientexamlist/PatientexamlistMapper.java index 9c19a304e..86b0f6756 100644 --- a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/dal/mysql/patientexamlist/PatientexamlistMapper.java +++ b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/dal/mysql/patientexamlist/PatientexamlistMapper.java @@ -64,7 +64,8 @@ public interface PatientexamlistMapper extends BaseMapperX { .eqIfPresent(PatientexamlistDO::getReportstatus, reqVO.getReportstatus()) .betweenIfPresent(PatientexamlistDO::getUploadDate, reqVO.getUploadDate()) .likeIfPresent(PatientexamlistDO::getOrgName, reqVO.getOrgName()) - .eqIfPresent(PatientexamlistDO::getOrgId, reqVO.getOrgId()) + // .eqIfPresent(PatientexamlistDO::getOrgId, reqVO.getOrgId()) + // .eqIfPresent(PatientexamlistDO::getHighLevelOrgId, reqVO.getHighLevelOrgId()) .betweenIfPresent(PatientexamlistDO::getCreateDate, reqVO.getCreateDate()) .eqIfPresent(PatientexamlistDO::getExamDescription, reqVO.getExamDescription()) @@ -74,6 +75,12 @@ public interface PatientexamlistMapper extends BaseMapperX { .betweenIfPresent(PatientexamlistDO::getCreateTime, reqVO.getCreateTime()) .eqIfPresent(PatientexamlistDO::getOrgId, reqVO.getHighLevelOrgId()) .eqIfPresent(PatientexamlistDO::getIsFavourite,reqVO.getIsFavourite()) + .eq(PatientexamlistDO::getOrgId, reqVO.getOrgId()) // 始终添加orgId条件 + .or(wrapper -> { + if (reqVO.getHighLevelOrgId() != null) { + wrapper.eq(PatientexamlistDO::getOrgId, reqVO.getHighLevelOrgId()); + } + }) .orderByDesc(PatientexamlistDO::getId)); }