Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreWidgetApiServiceImpl.java

@@ -244,13 +244,21 @@ public class StoreWidgetApiServiceImpl implements StoreWidgetApiService {
             List<StoreDTO> result = page.getResult();
             if(CollectionUtils.isNotEmpty(result)){
                 for(StoreDTO storeDTO : result){
-                    storeColumnSet.getErpStatus().add(storeDTO.getErpStatus());
-                    storeColumnSet.getRegion().add(storeDTO.getRegionId());
-                    storeColumnSet.getStatus().add(storeDTO.getStatus());
+                    if(storeDTO.getErpStatus() != null){
+                        storeColumnSet.getErpStatus().add(storeDTO.getErpStatus());
+                    }
+                    if(storeDTO.getRegionId() != null){
+                        storeColumnSet.getRegion().add(storeDTO.getRegionId());
+                    }
+                    if(storeDTO.getStatus() != null){
+                        storeColumnSet.getStatus().add(storeDTO.getStatus());
+                    }
                     if(CollectionUtils.isNotEmpty(storeDTO.getStoreGroupIdList())){
                         storeColumnSet.getStoreGroupId().addAll(storeDTO.getStoreGroupIdList());
                     }
-                    storeColumnSet.getStoreType().add(storeDTO.getStoreType());
+                    if(storeDTO.getStoreType() != null){
+                        storeColumnSet.getStoreType().add(storeDTO.getStoreType());
+                    }
                 }
             }
             if(pageNum == 1 && page.getPages() > 1){