Merge branch 'developer' into 'master'

Developer

See merge request !65

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

@@ -104,22 +104,22 @@ 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(storeSearchQo.getStoreIds().replaceAll(",",  " "));
+                storeSearchDTO.setStoreGroupIds(storeSearchQo.getStoreGroupIds().replaceAll(",",  " "));
+                storeSearchDTO.setRegionIds(storeSearchQo.getRegion().replaceAll(",",  " "));
+                storeSearchDTO.setStoreTypes(storeSearchQo.getStoreType().replaceAll(",",  " "));
+                storeSearchDTO.setStoreStatuss(storeSearchQo.getStoreStatus().replaceAll(",",  " "));
+                storeSearchDTO.setErpStatuss(storeSearchQo.getErpStatus().replaceAll(",",  " "));
+                storeSearchDTO.setStoreTags(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);
+                    String storeInfoIds = StringUtils.join(list, " ");
+                    storeSearchDTO.setStoreInfoIds(storeSearchDTO.getStoreInfoIds()+" "+ 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);