From 5bbf6b97525dd92c81fe91447953e7819f8a4e18 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 17 八月 2026 16:49:46 +0800
Subject: [PATCH] 上级账户可以将下属账户添加的团队成员退出团队
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleOrderMapper.java | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleOrderMapper.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleOrderMapper.java
index 79e4533..ac6dc97 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleOrderMapper.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleOrderMapper.java
@@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.erp.dal.mysql.sale;
+import cn.hutool.core.collection.CollUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.MPJLambdaWrapperX;
@@ -10,10 +11,12 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
+import java.util.List;
+
/**
* ERP 閿�鍞鍗� Mapper
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Mapper
public interface ErpSaleOrderMapper extends BaseMapperX<ErpSaleOrderDO> {
@@ -24,12 +27,45 @@
.eqIfPresent(ErpSaleOrderDO::getCustomerId, reqVO.getCustomerId())
.betweenIfPresent(ErpSaleOrderDO::getOrderTime, reqVO.getOrderTime())
.eqIfPresent(ErpSaleOrderDO::getStatus, reqVO.getStatus())
+ .eqIfPresent(ErpSaleOrderDO::getOutStatus, reqVO.getOutStatus())
+ .eqIfPresent(ErpSaleOrderDO::getProductionStatus, reqVO.getProductionStatus())
.likeIfPresent(ErpSaleOrderDO::getRemark, reqVO.getRemark())
.eqIfPresent(ErpSaleOrderDO::getCreator, reqVO.getCreator())
.orderByDesc(ErpSaleOrderDO::getId);
- if (reqVO.getProductId() != null) {
+ if (reqVO.getProductId() != null || reqVO.getNeedProduction() != null) {
query.leftJoin(ErpSaleOrderItemDO.class, ErpSaleOrderItemDO::getOrderId, ErpSaleOrderDO::getId)
.eq(reqVO.getProductId() != null, ErpSaleOrderItemDO::getProductId, reqVO.getProductId())
+ .eq(reqVO.getNeedProduction() != null, ErpSaleOrderItemDO::getNeedProduction, reqVO.getNeedProduction())
+ .groupBy(ErpSaleOrderDO::getId); // 閬垮厤 1 瀵瑰鏌ヨ锛屼骇鐢熺浉鍚岀殑 1
+ }
+ return selectJoinPage(reqVO, ErpSaleOrderDO.class, query);
+ }
+
+ /**
+ * 鍒嗛〉鏌ヨ锛堝甫瀹㈡埛鏉冮檺杩囨护锛�
+ */
+ default PageResult<ErpSaleOrderDO> selectPage(ErpSaleOrderPageReqVO reqVO, List<Long> permittedCustomerIds) {
+ MPJLambdaWrapperX<ErpSaleOrderDO> query = new MPJLambdaWrapperX<ErpSaleOrderDO>()
+ .likeIfPresent(ErpSaleOrderDO::getNo, reqVO.getNo())
+ .eqIfPresent(ErpSaleOrderDO::getCustomerId, reqVO.getCustomerId())
+ .betweenIfPresent(ErpSaleOrderDO::getOrderTime, reqVO.getOrderTime())
+ .eqIfPresent(ErpSaleOrderDO::getStatus, reqVO.getStatus())
+ .eqIfPresent(ErpSaleOrderDO::getOutStatus, reqVO.getOutStatus())
+ .eqIfPresent(ErpSaleOrderDO::getProductionStatus, reqVO.getProductionStatus())
+ .likeIfPresent(ErpSaleOrderDO::getRemark, reqVO.getRemark())
+ .eqIfPresent(ErpSaleOrderDO::getCreator, reqVO.getCreator())
+ .orderByDesc(ErpSaleOrderDO::getId);
+ // 瀹㈡埛鏉冮檺杩囨护
+ if (permittedCustomerIds != null) {
+ if (CollUtil.isEmpty(permittedCustomerIds)) {
+ return PageResult.empty();
+ }
+ query.in(ErpSaleOrderDO::getCustomerId, permittedCustomerIds);
+ }
+ if (reqVO.getProductId() != null || reqVO.getNeedProduction() != null) {
+ query.leftJoin(ErpSaleOrderItemDO.class, ErpSaleOrderItemDO::getOrderId, ErpSaleOrderDO::getId)
+ .eq(reqVO.getProductId() != null, ErpSaleOrderItemDO::getProductId, reqVO.getProductId())
+ .eq(reqVO.getNeedProduction() != null, ErpSaleOrderItemDO::getNeedProduction, reqVO.getNeedProduction())
.groupBy(ErpSaleOrderDO::getId); // 閬垮厤 1 瀵瑰鏌ヨ锛屼骇鐢熺浉鍚岀殑 1
}
return selectJoinPage(reqVO, ErpSaleOrderDO.class, query);
--
Gitblit v1.9.3