交收库查询条件问题修改

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

@@ -870,13 +870,14 @@ public class DwxxServiceImpl implements DwxxService {
         int areaLevel = pageReqVO.getAreaLevel();
         switch (areaLevel) {
             case 1:
+                pageReqVO.setAreaSheng(pageReqVO.getAreaCode());
                 AreaLevelDO sheng = findAreaLevel(allAreaLevels, pageReqVO.getAreaCode());
                 if (sheng != null) {
                     pageReqVO.setAreaCode(String.format("%s%s", sheng.getAreaName(), "%"));
                 }
-                pageReqVO.setAreaSheng(pageReqVO.getAreaCode());
                 break;
             case 2:
+                pageReqVO.setAreaShi(pageReqVO.getAreaCode());
                 AreaLevelDO shi = findAreaLevel(allAreaLevels, pageReqVO.getAreaCode());
                 AreaLevelDO sheng2 = findAreaLevel(allAreaLevels, pageReqVO.getParentCode());
                 if (shi != null && sheng2 != null) {
@@ -886,9 +887,9 @@ public class DwxxServiceImpl implements DwxxService {
                         pageReqVO.setAreaCode(String.format("%s%s%s%s", sheng2.getAreaName(), ",", shi.getAreaName(), "%"));
                     }
                 }
-                pageReqVO.setAreaShi(pageReqVO.getAreaCode());
                 break;
             case 3:
+                pageReqVO.setAreaXian(pageReqVO.getAreaCode());
                 AreaLevelDO xian = findAreaLevel(allAreaLevels, pageReqVO.getAreaCode());
                 AreaLevelDO shi3 = findAreaLevel(allAreaLevels, pageReqVO.getParentCode());
                 if (shi3 != null) {
@@ -897,7 +898,6 @@ public class DwxxServiceImpl implements DwxxService {
                         pageReqVO.setAreaCode(String.format("%s%s%s%s%s%s", sheng3.getAreaName(), ",", shi3.getAreaName(), ",", xian.getAreaName(), "%"));
                     }
                 }
-                pageReqVO.setAreaXian(pageReqVO.getAreaCode());
                 break;
         }
     }