提交代码

hai-bweb/src/main/java/com/bweb/controller/HighGasController.java

@@ -447,7 +447,7 @@ public class HighGasController {
 
             Map<String, Object> param = new HashMap<>();
             param.put("type", 1);
-            param.put("sourceType", 1);
+            param.put("sourceType", "1,3");
             param.put("status", 1);
 
             if (userInfoModel.getSecUser().getObjectType().equals(UserObjectTypeEnum.type0.getType())) {

hai-service/src/main/java/com/hai/service/impl/HighMerchantStoreServiceImpl.java

@@ -26,11 +26,9 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.Comparator;
+import java.util.*;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 
 @Service("highMerchantStoreService")
@@ -207,8 +205,11 @@ public class HighMerchantStoreServiceImpl implements HighMerchantStoreService {
             criteria.andTypeEqualTo(MapUtils.getInteger(map, "type"));
         }
 
-        if (MapUtils.getInteger(map, "sourceType") != null) {
+        if (StringUtils.isNotBlank(MapUtils.getString(map, "sourceType"))) {
-            criteria.andSourceTypeEqualTo(MapUtils.getInteger(map, "sourceType"));
+            List<Integer> sourceType = Arrays.stream(MapUtils.getString(map, "sourceType").split(","))
+                    .flatMapToInt(num -> IntStream.of(Integer.parseInt(num))).boxed()
+                    .collect(Collectors.toList());
+            criteria.andSourceTypeIn(sourceType);
         }
 
         if (MapUtils.getLong(map, "companyId") != null) {