From 15f0ac8c4c407075ad7a2e07eb8823d72234c62c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 26 五月 2023 15:18:56 +0800
Subject: [PATCH] 分公司,司机修改

---
 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java |   30 ++++++++++++++++++++----------
 1 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
index 7a85671..9f1e6bd 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -253,7 +253,7 @@
 
         // 查询区
         List<Integer> cityIds = tRegions1.stream().map(TRegion::getId).collect(Collectors.toList());
-        List<TRegion> tRegions2 = tRegionService.selectList(new EntityWrapper<TRegion>().in("parent_id", cityIds));
+        List<TRegion> tRegions2 = tRegionService.selectList(new EntityWrapper<TRegion>().in("parent_id", split1[1]));
         model.addAttribute("districtList",tRegions2);
 
         return PREFIX + "tDriverAreaUpdate.html";
@@ -267,15 +267,15 @@
         String[] split1 = areaId.split("/");
         List<TRegion> tRegions = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0));
         model.addAttribute("provinceList",tRegions);
-        List<Integer> provinceIds = tRegions.stream().map(TRegion::getId).collect(Collectors.toList());
-        // 查询市
-        List<TRegion> tRegions1 = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", split1[0]));
-        model.addAttribute("cityList",tRegions1);
-
-        // 查询区
-        List<Integer> cityIds = tRegions1.stream().map(TRegion::getId).collect(Collectors.toList());
-        List<TRegion> tRegions2 = tRegionService.selectList(new EntityWrapper<TRegion>().in("parent_id", cityIds));
-        model.addAttribute("districtList",tRegions2);
+//        List<Integer> provinceIds = tRegions.stream().map(TRegion::getId).collect(Collectors.toList());
+//        // 查询市
+//        List<TRegion> tRegions1 = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", split1[0]));
+//        model.addAttribute("cityList",tRegions1);
+//
+//        // 查询区
+//        List<Integer> cityIds = tRegions1.stream().map(TRegion::getId).collect(Collectors.toList());
+//        List<TRegion> tRegions2 = tRegionService.selectList(new EntityWrapper<TRegion>().in("parent_id", cityIds));
+//        model.addAttribute("districtList",tRegions2);
 
         if(StringUtils.hasLength(area) && StringUtils.hasLength(areaId)){
             String[] split = area.split("/");
@@ -294,7 +294,17 @@
             }else {
                 model.addAttribute("districtId", "");
             }
+
+            List<TRegion> tRegions1 = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", split1[0]));
+            model.addAttribute("cityList",tRegions1);
+
+            // 查询区
+            List<TRegion> tRegions2 = tRegionService.selectList(new EntityWrapper<TRegion>().in("parent_id", split1[1]));
+            model.addAttribute("districtList",tRegions2);
         }else {
+            model.addAttribute("cityList",new ArrayList<>());
+            model.addAttribute("districtList",new ArrayList<>());
+
             model.addAttribute("provinceName","");
             model.addAttribute("cityName","split[1]");
             model.addAttribute("districtName","");

--
Gitblit v1.7.1