Merge branch 'refs/heads/GB-local'

delivery-module-core/delivery-module-core-api/src/main/java/com/unis/module/core/enums/CityConstants.java

@@ -0,0 +1,14 @@
+package com.unis.module.core.enums;
+
+/**
+ * Infra 城市枚举类
+ *
+ */
+public interface CityConstants {
+    String[] CITY = new String[]{
+            "北京市",  // 北京
+            "天津市",  // 天津
+            "上海市",  // 上海
+            "重庆市"   // 重庆
+    };
+}

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/dwxx/DwxxServiceImpl.java

@@ -40,6 +40,7 @@ import com.unis.module.coding.dal.mysql.fmxx.FmxxMapper;
 import com.unis.module.coding.dal.mysql.kqxx.KqxxMapper;
 import com.unis.module.coding.dal.mysql.province.ProvinceMapper;
 import com.unis.module.coding.dal.mysql.users.UsersMapper;
+import com.unis.module.core.enums.CityConstants;
 import com.unis.module.core.enums.XZQHLEVEL;
 import com.unis.module.core.enums.YXZT;
 import com.unis.module.system.dal.dataobject.arealevel.AreaLevelDO;
@@ -235,6 +236,10 @@ public class DwxxServiceImpl implements DwxxService {
                      s.setCfzt(pageReqVO.getCfzt());
                      s.setCfEnd(pageReqVO.getCfEnd());
                      s.setCfStart(pageReqVO.getCfStart());
+                    if (Arrays.asList(CityConstants.CITY).contains(s.getSheng())) {
+                        s.setShi(s.getXian());
+                        s.setXian(null);
+                    }
                 });
             }
         }
@@ -713,11 +718,17 @@ public class DwxxServiceImpl implements DwxxService {
                 if (parts.length != 0) {
                     province = parts[0];
                     if (parts.length == 3) {
-                        city = parts[1];
-                        county = parts[2];
+                        if (Arrays.asList(CityConstants.CITY).contains(province)) {
+                            city = parts[2];
+                        }else {
+                            city = parts[1];
+                            county = parts[2];
+                        }
                     }
                     if (parts.length == 2) {
-                        city = parts[1];
+                        if (!Arrays.asList(CityConstants.CITY).contains(province)) {
+                            city = parts[1];
+                        }
                     }
                 }
                 List<AreaLevelDO> areaLevelDOS = areaLevelMapper.selectListByName(Arrays.asList(province, city, county));