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/StoreFieldApiServiceImpl.java

@@ -75,7 +75,7 @@ public class StoreFieldApiServiceImpl implements StoreFieldApiService {
             if (StringUtils.isBlank(region)) {
                 continue;
             }
-            if (!NumberUtils.isNumber(region)) {
+            if (!StringUtils.isNumeric(region)) {
                 return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "门店域有误");
             }
             if (storeRegionService.getById(storeFieldDTO.getEnterpriseId(), Integer.parseInt(region)) == null) {

gic-store-service/src/main/resources/mapper/TabStoreFieldMapper.xml

@@ -352,7 +352,7 @@
   <select id="countStoreField" resultType="int">
     select
     count(DISTINCT a.store_field_id)
-    from tab_store_field_region_rel a
+    from tab_store_field a
     LEFT JOIN tab_store_field_rel b
     on a.store_field_id = b.store_field_id
     and b.status = 1

gic-store-web/src/main/java/com/gic/store/web/controller/StoreFieldController.java

@@ -107,6 +107,12 @@ public class StoreFieldController {
         String[] regionArr = regions.split(",");
         StringBuilder region = new StringBuilder("_");
         for (String str : regionArr) {
+            if (StringUtils.isBlank(str)) {
+                continue;
+            }
+            if (!StringUtils.isNumeric(str)) {
+                return RestResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "门店域有误");
+            }
             region.append(Integer.parseInt(str));
             region.append("_");
         }