xucaiqin hace 2 semanas
padre
commit
8d0297d8cc

+ 7 - 3
sckw-modules/sckw-product/src/main/java/com/sckw/product/service/KwpGoodsService.java

@@ -1028,7 +1028,11 @@ public class KwpGoodsService {
             if (Objects.nonNull(params.getSign())) {//查询签约或未签约商品
                 List<Long> longs = tradeOrderInfoService.querySignGoods(LoginUserHolder.getEntId());
                 if (Objects.equals(params.getSign(), 1)) {
-                    wrapper.in(CollUtil.isNotEmpty(longs), KwpGoods::getId, longs);
+                    if (CollUtil.isNotEmpty(longs)) {
+                        wrapper.in(KwpGoods::getId, longs);
+                    } else {
+                        wrapper.eq(KwpGoods::getId, 0L);
+                    }
                 } else {
                     wrapper.notIn(CollUtil.isNotEmpty(longs), KwpGoods::getId, longs);
                 }
@@ -1508,8 +1512,8 @@ public class KwpGoodsService {
         List<EntCacheResDto> entList = remoteSystemService.queryEntCacheByIds(supplyEntIds);
         Map<Long, String> entMap = entList.stream().collect(Collectors.toMap(EntCacheResDto::getId, EntCacheResDto::getFirmName, (k1, k2) -> k1));
         Map<String, Map<String, String>> dict = remoteSystemService.queryDictByType(List.of(DictTypeEnum.PRODUCT_NAME_TYPE.getType(),
-                DictTypeEnum.UNIT_TYPE.getType(),DictTypeEnum.GOODS_SPEC.getType()));
-        Map<String, String> productNameMap, unitMap,goodsMap;
+                DictTypeEnum.UNIT_TYPE.getType(), DictTypeEnum.GOODS_SPEC.getType()));
+        Map<String, String> productNameMap, unitMap, goodsMap;
         if (CollectionUtils.isNotEmpty(dict)) {
             productNameMap = dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
             unitMap = dict.get(DictTypeEnum.UNIT_TYPE.getType());