From 1892f1e72f81ef87a8fa78ce0c13354f0a6bb6ea Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期四, 22 一月 2026 21:41:13 +0800
Subject: [PATCH] fix(management):0122测试bug

---
 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java |   52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 52 insertions(+), 0 deletions(-)

diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
index 3b2e5b9..6492c7b 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
@@ -134,6 +134,32 @@
         model.addAttribute("zcModelList",zcModelList);
         List<TServerCarmodel> kcModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 2).eq("state", 1));
         model.addAttribute("kcModelList",kcModelList);
+
+        //查询经营业务配置
+        Integer isSpe = 1;  //默认显示所有
+        Integer isTaxi = 1;
+        Integer isCross = 1;
+
+        TCompany businessCompany = null;  //用于查询经营业务的公司对象
+        if (2 == roleType) {  //分公司
+            businessCompany = tCompanyService.selectById(shiroExtUtil.getUser().getObjectId());
+        } else if (3 == roleType) {  //加盟商
+            TCompany franchisee = tCompanyService.selectById(shiroExtUtil.getUser().getObjectId());
+            if (SinataUtil.isNotEmpty(franchisee) && SinataUtil.isNotEmpty(franchisee.getSuperiorId())) {
+                businessCompany = tCompanyService.selectById(franchisee.getSuperiorId());
+            }
+        }
+
+        if (SinataUtil.isNotEmpty(businessCompany)) {
+            isSpe = businessCompany.getIsSpe() != null ? businessCompany.getIsSpe() : 1;
+            isTaxi = businessCompany.getIsTaxi() != null ? businessCompany.getIsTaxi() : 1;
+            isCross = businessCompany.getIsCross() != null ? businessCompany.getIsCross() : 1;
+        }
+
+        model.addAttribute("isSpe", isSpe);
+        model.addAttribute("isTaxi", isTaxi);
+        model.addAttribute("isCross", isCross);
+
         return PREFIX + "tCar_add.html";
     }
 
@@ -237,6 +263,32 @@
         //车辆类型
         List<TCarModel> modelList = tCarModelService.selectList(new EntityWrapper<TCarModel>().eq("brandId",tCar.getCarBrandId()).eq("state", 1));
         model.addAttribute("modelList",modelList);
+
+        //查询经营业务配置
+        Integer isSpe = 1;  //默认显示所有
+        Integer isTaxi = 1;
+        Integer isCross = 1;
+
+        TCompany businessCompany = null;  //用于查询经营业务的公司对象
+        if (2 == roleType) {  //分公司
+            businessCompany = tCompanyService.selectById(shiroExtUtil.getUser().getObjectId());
+        } else if (3 == roleType) {  //加盟商
+            TCompany franchisee = tCompanyService.selectById(shiroExtUtil.getUser().getObjectId());
+            if (SinataUtil.isNotEmpty(franchisee) && SinataUtil.isNotEmpty(franchisee.getSuperiorId())) {
+                businessCompany = tCompanyService.selectById(franchisee.getSuperiorId());
+            }
+        }
+
+        if (SinataUtil.isNotEmpty(businessCompany)) {
+            isSpe = businessCompany.getIsSpe() != null ? businessCompany.getIsSpe() : 1;
+            isTaxi = businessCompany.getIsTaxi() != null ? businessCompany.getIsTaxi() : 1;
+            isCross = businessCompany.getIsCross() != null ? businessCompany.getIsCross() : 1;
+        }
+
+        model.addAttribute("isSpe", isSpe);
+        model.addAttribute("isTaxi", isTaxi);
+        model.addAttribute("isCross", isCross);
+
         return PREFIX + "tCar_edit.html";
     }
 

--
Gitblit v1.7.1