地图展示-条件筛选

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/kshzs/KshzsServiceImpl.java

@@ -63,28 +63,28 @@ public class KshzsServiceImpl implements KshzsService{
         Map<String, Object> mobjMap = new HashMap<>();
         List<Map<String, Object>> objData = new ArrayList<>();
         Map<String, Object> objMap = new HashMap<>();
+        if(paramVo.getLspzmc() != null && !"".equals(paramVo.getLspzmc())){
+            List<String> lspzmcLst = new ArrayList<>();
+            String[] split = paramVo.getLspzmc().split(",");
+            for (int i = 0; i < split.length; i++) {
+                lspzmcLst.add((split[i]));
+                paramVo.setLspzmcLst(lspzmcLst);
+            }
+        }
+        if(paramVo.getLsdjdm() != null && !"".equals(paramVo.getLsdjdm())){
+            List<String> lsdjdmLst = new ArrayList<>();
+            String[] split = paramVo.getLsdjdm().split(",");
+            for (int i = 0; i < split.length; i++) {
+                lsdjdmLst.add((split[i]));
+                paramVo.setLsdjdmLst(lsdjdmLst);
+            }
+        }
         if(paramVo.getXzqhdm() != null && !"".equals(paramVo.getXzqhdm())) {
             // 省的库点数量
             objData = kshzsMapper.queryList(paramVo);
             // 卡片数据
             objMap = kshzsMapper.selectCardList(paramVo);
         }else{
-            if(paramVo.getLspzmc() != null && !"".equals(paramVo.getLspzmc())){
-                List<String> lspzmcLst = new ArrayList<>();
-                String[] split = paramVo.getLspzmc().split(",");
-                for (int i = 0; i < split.length; i++) {
-                    lspzmcLst.add((split[i]));
-                    paramVo.setLspzmcLst(lspzmcLst);
-                }
-            }
-            if(paramVo.getLsdjdm() != null && !"".equals(paramVo.getLsdjdm())){
-                List<String> lsdjdmLst = new ArrayList<>();
-                String[] split = paramVo.getLsdjdm().split(",");
-                for (int i = 0; i < split.length; i++) {
-                    lsdjdmLst.add((split[i]));
-                    paramVo.setLsdjdmLst(lsdjdmLst);
-                }
-            }
             // 各省的库存数量
             // objData = kshzsMapper.selectList(paramVo);
             objMap = kshzsMapper.selectCardList(paramVo);