Merge remote-tracking branch 'origin/developer' into developer

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/StoreSearchUtils.java

@@ -104,22 +104,28 @@ public class StoreSearchUtils {
             }else {
                 StoreSearchDTO storeSearchDTO = new StoreSearchDTO();
                 storeSearchDTO.setEnterpriseId(enterpriseId);
-                storeSearchDTO.setStoreInfoIds(storeSearchQo.getStoreIds());
-                storeSearchDTO.setStoreGroupIds(storeSearchQo.getStoreGroupIds());
-                storeSearchDTO.setRegionIds(storeSearchQo.getRegion());
-                storeSearchDTO.setStoreTypes(storeSearchQo.getStoreType());
-                storeSearchDTO.setStoreStatuss(storeSearchQo.getStoreStatus());
-                storeSearchDTO.setErpStatuss(storeSearchQo.getErpStatus());
-                storeSearchDTO.setStoreTags(storeSearchQo.getStoreTag());
+                storeSearchDTO.setStoreInfoIds(StringUtils.isBlank(storeSearchQo.getStoreIds()) ? null : storeSearchQo.getStoreIds().replaceAll(",",  " "));
+                storeSearchDTO.setStoreGroupIds(StringUtils.isBlank(storeSearchQo.getStoreGroupIds()) ? null : storeSearchQo.getStoreGroupIds().replaceAll(",",  " "));
+                storeSearchDTO.setRegionIds(StringUtils.isBlank(storeSearchQo.getRegion()) ? null : storeSearchQo.getRegion().replaceAll(",",  " "));
+                storeSearchDTO.setStoreTypes(StringUtils.isBlank(storeSearchQo.getStoreType()) ? null :storeSearchQo.getStoreType().replaceAll(",",  " "));
+                storeSearchDTO.setStoreStatuss(StringUtils.isBlank(storeSearchQo.getStoreStatus()) ? null :storeSearchQo.getStoreStatus().replaceAll(",",  " "));
+                storeSearchDTO.setErpStatuss(StringUtils.isBlank(storeSearchQo.getErpStatus()) ? null :storeSearchQo.getErpStatus().replaceAll(",",  " "));
+                storeSearchDTO.setStoreTags(StringUtils.isBlank(storeSearchQo.getStoreTag()) ? null :storeSearchQo.getStoreTag().replaceAll(",",  " "));
                 if(storeSearchQo.getAttentionStore() == 1){
                     List<AttentionStoreDTO> result = this.storeAttentionApiService.pageStoreAttention(userId, enterpriseId, 1, Integer.MAX_VALUE).getResult().getResult();
-                    List<Integer> list = result.stream().map(t -> t.getStoreId()).collect(Collectors.toList());
-                    String storeInfoIds = StringUtils.join(list, ",");
-                    storeSearchDTO.setStoreInfoIds(storeSearchDTO.getStoreInfoIds()+","+ storeInfoIds);
+                    List<Integer> list = result.stream().filter(t -> {
+                        if(t.getStoreId() != null){
+                            return true;
+                        }else {
+                            return false;
+                        }
+                    }).map(dto -> dto.getStoreId()).collect(Collectors.toList());
+                    String storeInfoIds = StringUtils.join(list, " ");
+                    storeSearchDTO.setStoreInfoIds(StringUtils.isNotBlank(storeSearchDTO.getStoreInfoIds()) ? storeSearchDTO.getStoreInfoIds()+" "+ storeInfoIds : storeInfoIds);
                 }
                 if(storeSearchQo.getTmpStore() == 0){
                     if(CollectionUtils.isNotEmpty(tempStoreIdList)){
-                        storeSearchDTO.setStoreInfoIdsOfNot(StringUtils.join(tempStoreIdList, ","));
+                        storeSearchDTO.setStoreInfoIdsOfNot(StringUtils.join(tempStoreIdList, " "));
                     }
                 }
                 ServiceResponse<Page<StoreDTO>> pageServiceResponse = this.storeApiService.listStore(storeSearchDTO, 1, 20000);