From 79f950b20447ad5faf1adfb39cfb2a726086c80a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 19 十月 2026 13:07:52 +0800
Subject: [PATCH] feat(config): 添加生产环境配置并更新公司部署设置
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnsales/MesWmReturnSalesMapper.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnsales/MesWmReturnSalesMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnsales/MesWmReturnSalesMapper.java
index 208373a..28e8373 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnsales/MesWmReturnSalesMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnsales/MesWmReturnSalesMapper.java
@@ -13,7 +13,7 @@
/**
* MES 閿�鍞��璐у崟 Mapper
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Mapper
public interface MesWmReturnSalesMapper extends BaseMapperX<MesWmReturnSalesDO> {
@@ -24,6 +24,7 @@
.likeIfPresent(MesWmReturnSalesDO::getName, reqVO.getName())
.likeIfPresent(MesWmReturnSalesDO::getSalesOrderCode, reqVO.getSalesOrderCode())
.eqIfPresent(MesWmReturnSalesDO::getClientId, reqVO.getClientId())
+ .likeIfPresent(MesWmReturnSalesDO::getClientName, reqVO.getClientName())
.eqIfPresent(MesWmReturnSalesDO::getStatus, reqVO.getStatus())
.betweenIfPresent(MesWmReturnSalesDO::getReturnDate, reqVO.getReturnDate())
.orderByDesc(MesWmReturnSalesDO::getId));
@@ -38,14 +39,18 @@
.likeIfPresent(MesWmReturnSalesDO::getName, reqVO.getName())
.likeIfPresent(MesWmReturnSalesDO::getSalesOrderCode, reqVO.getSalesOrderCode())
.eqIfPresent(MesWmReturnSalesDO::getClientId, reqVO.getClientId())
+ .likeIfPresent(MesWmReturnSalesDO::getClientName, reqVO.getClientName())
.eqIfPresent(MesWmReturnSalesDO::getStatus, reqVO.getStatus())
.betweenIfPresent(MesWmReturnSalesDO::getReturnDate, reqVO.getReturnDate())
.orderByDesc(MesWmReturnSalesDO::getId);
if (permittedClientIds != null) {
- if (CollUtil.isEmpty(permittedClientIds)) {
- return PageResult.empty();
- }
- wrapper.in(MesWmReturnSalesDO::getClientId, permittedClientIds);
+ // 鎵嬪伐濉啓瀹㈡埛鍚嶇О锛堟湭鍏宠仈瀹㈡埛妗ｆ锛夌殑鍗曟嵁涓嶅睘浜庝换浣曞鎴锋潈闄愯寖鍥达紝濮嬬粓鍙
+ wrapper.and(w -> {
+ w.isNull(MesWmReturnSalesDO::getClientId);
+ if (CollUtil.isNotEmpty(permittedClientIds)) {
+ w.or().in(MesWmReturnSalesDO::getClientId, permittedClientIds);
+ }
+ });
}
return selectPage(reqVO, wrapper);
}
--
Gitblit v1.9.3