From 6de15528a3ba8f9c87d9aaffe895e69fdcdc9026 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 16 十月 2026 21:28:43 +0800
Subject: [PATCH] fix(system): 修复用户导入「覆盖」分支不可达，导入测试对齐新模板列
---
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..e4f979f 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
@@ -44,9 +44,12 @@
.orderByDesc(MesQcOqcDO::getId);
if (permittedClientIds != null) {
if (CollUtil.isEmpty(permittedClientIds)) {
- return PageResult.empty();
+ wrapper.isNull(MesQcOqcDO::getClientId);
+ } else {
+ // 鏈叧鑱斿鎴风殑妫�楠屽崟鍙锛涘凡鍏宠仈瀹㈡埛浠嶆寜 CRM 鏉冮檺杩囨护銆�
+ wrapper.and(w -> w.isNull(MesQcOqcDO::getClientId)
+ .or().in(MesQcOqcDO::getClientId, permittedClientIds));
}
- 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