From bf612288a7667989b2d6686dbdc4f50d2b6015b3 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 08 九月 2025 17:52:44 +0800
Subject: [PATCH] 修改bug

---
 ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
index 55adaa4..d18f131 100644
--- a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
+++ b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -102,7 +102,7 @@
      */
     @RequestMapping("/tDriver_add")
     public String tDriverAdd(Model model) {
-        List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2));
+        List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2).eq("state", 1).ne("flag", 3));
         model.addAttribute("companyList",companyList);
 
         Integer roleType = ShiroKit.getUser().getRoleType();
@@ -111,8 +111,8 @@
             List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>()
                     .eq("type", 3)
                     .eq("superiorId",ShiroKit.getUser().getObjectId())
-                    .notIn("state",1)
-                    .notIn("flag",3));
+                    .eq("state",1)
+                    .ne("flag",3));
             model.addAttribute("franchiseeList",franchiseeList);
         }else{
             model.addAttribute("franchiseeList",null);
@@ -717,10 +717,12 @@
      */
     @RequestMapping(value = "/delete")
     @ResponseBody
-    public Object delete(@RequestParam Integer tDriverId) {
-        TDriver driver = tDriverService.selectById(tDriverId);
-        driver.setFlag("3");
-        tDriverService.updateById(driver);
+    public Object delete(@RequestParam String tDriverId) {
+        for (String s : tDriverId.split(",")) {
+            TDriver driver = tDriverService.selectById(s);
+            driver.setFlag("3");
+            tDriverService.updateById(driver);
+        }
         return SUCCESS_TIP;
     }
     /**

--
Gitblit v1.7.1