瀏覽代碼

过滤问题处理

yzc 1 年之前
父節點
當前提交
e8e5333463

+ 3 - 4
hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -356,10 +356,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         //产品id过滤
         if (ObjectUtil.isNotEmpty(dto.getProductId())) {
             List<Long> contractIds = contractProductService.listObject(ContractProduct::getContractId, q -> q.eq(ContractProduct::getProductId, dto.getProductId()));
-            if (ObjectUtil.isNotEmpty(contractIds)) {
-                contractIds = contractIds.stream().distinct().collect(Collectors.toList());
-                wrapper.in("t1.id", contractIds);
-            }
+            contractIds.add(-1L);
+            contractIds = contractIds.stream().distinct().collect(Collectors.toList());
+            wrapper.in("t1.id", contractIds);
         }
 
         //是否结清过滤

+ 1 - 3
hx-sale/src/main/resources/mapper/contract/ContractMapper.xml

@@ -11,8 +11,7 @@
                          WHEN t1.sumClaimMoney = 0 THEN
                              0
                          ELSE 10
-                         END                                   AS refundStatusNew,
-                     cp.product_id
+                         END                                   AS refundStatusNew
               FROM (SELECT t1.*,
                            c.name                            customerName,
                            us.nick_name                      salesmanName,
@@ -25,7 +24,6 @@
                     FROM contract t1
                              left join bytesailing_customer.customer c on t1.buy_corporation_id = c.id
                              left join bytesailing_base.sys_user us on c.user_id = us.user_id) t1
-                       LEFT JOIN contract_product cp ON cp.contract_id = t1.id
               GROUP BY t1.id) t1
             ${ew.customSqlSegment}
     </select>