交收库列表直辖市优化

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

@@ -236,7 +236,7 @@ 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())) {
+                    if (Arrays.asList(CityConstants.CITY).contains(s.getSheng()) && "1".equals(areaLevel)) {
                         s.setShi(s.getXian());
                         s.setXian(null);
                     }
@@ -720,6 +720,9 @@ public class DwxxServiceImpl implements DwxxService {
                     if (parts.length == 3) {
                         if (Arrays.asList(CityConstants.CITY).contains(province)) {
                             city = parts[2];
+                            if (parts[2] == null || parts[2].isEmpty()) {
+                                city = parts[1];
+                            }
                         }else {
                             city = parts[1];
                             county = parts[2];