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

@@ -247,7 +247,9 @@ public class StoreWidgetApiServiceImpl implements StoreWidgetApiService {
                     storeColumnSet.getErpStatus().add(storeDTO.getErpStatus());
                     storeColumnSet.getRegion().add(storeDTO.getRegionId());
                     storeColumnSet.getStatus().add(storeDTO.getStatus());
-                    storeColumnSet.getStoreGroupId().addAll(storeDTO.getStoreGroupIdList());
+                    if(CollectionUtils.isNotEmpty(storeDTO.getStoreGroupIdList())){
+                        storeColumnSet.getStoreGroupId().addAll(storeDTO.getStoreGroupIdList());
+                    }
                     storeColumnSet.getStoreType().add(storeDTO.getStoreType());
                 }
             }