From 29237e8dd94c4d3cdfb0eb48bca0de7dc68d768e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 十一月 2026 11:27:55 +0800
Subject: [PATCH] feat(mes): 出货检验单客户改为选填，未关联客户的单据不受客户数据权限限制
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/oqc/MesQcOqcMapper.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 8674163..f1791f3 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
@@ -43,10 +43,13 @@
.betweenIfPresent(MesQcOqcDO::getInspectDate, reqVO.getInspectDate())
.orderByDesc(MesQcOqcDO::getId);
if (permittedClientIds != null) {
+ // 瀹㈡埛闈炲繀濉細鏈叧鑱斿鎴风殑鍑鸿揣妫�楠屽崟涓嶅睘浜庝换浣曞鎴凤紝涓嶅彈瀹㈡埛鏁版嵁鏉冮檺闄愬埗锛屽缁堝彲瑙�
if (CollUtil.isEmpty(permittedClientIds)) {
- return PageResult.empty();
+ wrapper.isNull(MesQcOqcDO::getClientId);
+ } else {
+ wrapper.and(w -> w.in(MesQcOqcDO::getClientId, permittedClientIds)
+ .or().isNull(MesQcOqcDO::getClientId));
}
- wrapper.in(MesQcOqcDO::getClientId, permittedClientIds);
}
return selectPage(reqVO, wrapper);
}
@@ -62,7 +65,8 @@
LocalDateTime outDate) {
return selectList(new LambdaQueryWrapperX<MesQcOqcDO>()
.eq(MesQcOqcDO::getItemId, itemId)
- .eq(MesQcOqcDO::getClientId, clientId)
+ .eq(clientId != null, MesQcOqcDO::getClientId, clientId)
+ .isNull(clientId == null, MesQcOqcDO::getClientId)
.eq(batchCode != null, MesQcOqcDO::getBatchCode, batchCode)
.isNull(batchCode == null, MesQcOqcDO::getBatchCode)
.eq(MesQcOqcDO::getOutDate, outDate)
--
Gitblit v1.9.3