From e100852268b6819c6168b25bc6c91a906274d622 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 21 九月 2026 16:01:31 +0800
Subject: [PATCH] feat(mes): 调整OQC检验单客户端权限控制逻辑
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/oqc/MesQcOqcMapper.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/oqc/MesQcOqcMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/oqc/MesQcOqcMapper.java
index 1a26e94..5e562f3 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/oqc/MesQcOqcMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/oqc/MesQcOqcMapper.java
@@ -25,6 +25,7 @@
.likeIfPresent(MesQcOqcDO::getBatchCode, reqVO.getBatchCode())
.eqIfPresent(MesQcOqcDO::getItemId, reqVO.getItemId())
.eqIfPresent(MesQcOqcDO::getCheckResult, reqVO.getCheckResult())
+ .betweenIfPresent(MesQcOqcDO::getInspectDate, reqVO.getInspectDate())
.orderByDesc(MesQcOqcDO::getId));
}
@@ -38,12 +39,16 @@
.likeIfPresent(MesQcOqcDO::getBatchCode, reqVO.getBatchCode())
.eqIfPresent(MesQcOqcDO::getItemId, reqVO.getItemId())
.eqIfPresent(MesQcOqcDO::getCheckResult, reqVO.getCheckResult())
+ .betweenIfPresent(MesQcOqcDO::getInspectDate, reqVO.getInspectDate())
.orderByDesc(MesQcOqcDO::getId);
if (permittedClientIds != null) {
if (CollUtil.isEmpty(permittedClientIds)) {
- return PageResult.empty();
+ wrapper.isNull(MesQcOqcDO::getClientId);
+ } else {
+ // 鍏佽 client_id 涓虹┖鐨勮褰曪紙鏈～瀹㈡埛鐨勬楠屽崟瀵规墍鏈夋湁鏉冮檺鐢ㄦ埛鍙锛�
+ wrapper.and(w -> w.in(MesQcOqcDO::getClientId, permittedClientIds)
+ .or().isNull(MesQcOqcDO::getClientId));
}
- wrapper.in(MesQcOqcDO::getClientId, permittedClientIds);
}
return selectPage(reqVO, wrapper);
}
--
Gitblit v1.9.3