tmp 合同过滤问题

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/operateService/KwcContractTradeService.java

@@ -523,17 +523,17 @@ public class KwcContractTradeService {
 
         try {
             log.debug("开始查询供应单位代理属性，supplyEntId: {}", supplyEntId);
-            
+
             // 调用远程系统服务查询企业属性类型列表
             List<EntTypeResDto> entTypeList = remoteSystemService.queryEntTypeByIds(Collections.singleton(supplyEntId));
-            
+
             // 判断是否包含代理属性类型
             boolean isAgent = hasSupplyAgentAttribute(entTypeList, supplyEntId);
             Integer result = isAgent ? Global.YES : Global.NO;
-            
+
             log.debug("供应单位代理属性查询完成，supplyEntId: {}, 结果: {}", supplyEntId, result);
             return result;
-            
+
         } catch (BusinessException e) {
             // 业务异常直接抛出，避免重复包装
             throw e;
@@ -569,7 +569,7 @@ public class KwcContractTradeService {
         if (isMatch) {
             log.debug("检测到供应单位具备代理属性，supplyEntId: {}", supplyEntId);
         }
-        
+
         return isMatch;
     }
 
@@ -2287,7 +2287,7 @@ public class KwcContractTradeService {
                         (x, y) -> x));
         // 判断当前查询的企业类型是否为供应方（供应商）
         if (Objects.equals(contractTradeOrderDto.getEntType(), CooperateTypeEnum.SUPPLIER.getCode())) {
-            log.debug("当前查询类型为供应方，执行销售员签约贸易合同查询逻辑。entId: {}, goodsId: {}", 
+            log.debug("当前查询类型为供应方，执行销售员签约贸易合同查询逻辑。entId: {}, goodsId: {}",
                     contractTradeOrderDto.getEntId(), contractTradeOrderDto.getGoodsId());
             // 调用专用方法查询当前登录用户作为销售员且已签约的贸易合同信息
             return querySalesmanSignedTradeOrder(contractTradeOrderDto, contractIds, conTractTradeUnitMap);
@@ -2348,7 +2348,7 @@ public class KwcContractTradeService {
         // 2. 查询指定合同集合下包含特定商品的合同商品信息
         Long goodsId = contractTradeOrderDto.getGoodsId();
         log.debug("开始查询销售员签约合同，合同IDs数量: {}, 商品ID: {}", contractIds.size(), goodsId);
-        
+
         List<KwcContractTradeGoods> kwcContractGoods = kwcContractTradeGoodsRepository.queryByContractIdsAndGoodsId(contractIds, goodsId);
         if (org.apache.commons.collections4.CollectionUtils.isEmpty(kwcContractGoods)) {
             log.debug("未找到包含指定商品的合同商品信息，商品ID: {}", goodsId);
@@ -2389,14 +2389,14 @@ public class KwcContractTradeService {
         //    - 组装返回对象：利用之前构建的 map 填充详细信息
         List<ContractTradeOrderInfo> result = kwcContractTrades.stream()
                 .filter(trade -> Objects.equals(trade.getStatus(), ContractStatusEnum.SIGNED.getCode()))
-                .filter(trade -> {
-                    boolean isMySale = Objects.equals(trade.getSalesmanId(), currentUserId);
-                    if (!isMySale) {
-                        log.trace("合同ID: {} 被过滤，因为销售员ID: {} 不匹配当前用户: {}", 
-                                trade.getId(), trade.getSalesmanId(), currentUserId);
-                    }
-                    return isMySale;
-                })
+//                .filter(trade -> {
+//                    boolean isMySale = Objects.equals(trade.getSalesmanId(), currentUserId);
+//                    if (!isMySale) {
+//                        log.trace("合同ID: {} 被过滤，因为销售员ID: {} 不匹配当前用户: {}",
+//                                trade.getId(), trade.getSalesmanId(), currentUserId);
+//                    }
+//                    return isMySale;
+//                })
                 .map(trade -> getContractTradeOrderInfo(trade, conTractTradeUnitMap, contractTradeOrderDto.getEntType(), contractGoodsMap))
                 .collect(Collectors.toList());
 
@@ -2438,7 +2438,7 @@ public class KwcContractTradeService {
                 .collect(Collectors.toList());
 
         log.debug("贸易合同订单关键字过滤完成，过滤后数据量: {}", filteredList.size());
-        
+
         return filteredList;
     }