总揽首页空指针修复

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/IndexModuleController.java

@@ -44,10 +44,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  *
@@ -164,14 +161,24 @@ public class IndexModuleController {
                 map.put("key", provinceDTO.getProvinceName());
                 map.put("mainStoreMemberCount", 0);
                 map.put("openStoreMemberCount", 0);
-                for(StoreProvinceData storeProvinceData : dataResponse.getResult()){
-                    if(provinceDTO.getProvinceName().equals(storeProvinceData.getProvince())){
-                        map.put("mainStoreMemberCount", storeProvinceData.getMemberCount());
+                if (dataResponse != null) {
+                    List<StoreProvinceData> storeProvinceDataList = dataResponse.getResult();
+                    if (CollectionUtils.isNotEmpty(storeProvinceDataList)) {
+                        storeProvinceDataList.forEach(e -> {
+                            if (provinceDTO.getProvinceName().equals(e.getProvince())) {
+                                map.put("mainStoreMemberCount", e.getMemberCount());
+                            }
+                        });
                     }
                 }
-                for(StoreProvinceData storeProvinceData : dataOpenStore.getResult()){
-                    if(provinceDTO.getProvinceName().equals(storeProvinceData.getProvince())){
-                        map.put("openStoreMemberCount", storeProvinceData.getMemberCount());
+                if (dataOpenStore != null) {
+                    List<StoreProvinceData> dataOpenStoreList = dataOpenStore.getResult();
+                    if (CollectionUtils.isNotEmpty(dataOpenStoreList)) {
+                        for (StoreProvinceData storeProvinceData : dataOpenStoreList) {
+                            if (provinceDTO.getProvinceName().equals(storeProvinceData.getProvince())) {
+                                map.put("openStoreMemberCount", storeProvinceData.getMemberCount());
+                            }
+                        }
                     }
                 }
                 //查询门店数量