From 5dacdee9b54c78372b68140e2b068d03a620eab9 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 02 七月 2025 19:00:52 +0800
Subject: [PATCH] 修改bug

---
 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TServerCarmodelController.java |   91 +++++++++++++++++++++++----------------------
 1 files changed, 46 insertions(+), 45 deletions(-)

diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TServerCarmodelController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TServerCarmodelController.java
index 354a7d8..e4a1f35 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TServerCarmodelController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TServerCarmodelController.java
@@ -6,18 +6,16 @@
 import com.stylefeng.guns.core.base.tips.ErrorTip;
 import com.stylefeng.guns.core.beetl.ShiroExtUtil;
 import com.stylefeng.guns.core.common.constant.factory.PageFactory;
-import com.stylefeng.guns.core.shiro.ShiroKit;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.stylefeng.guns.core.log.LogObjectHolder;
-import org.springframework.web.bind.annotation.RequestParam;
 import com.stylefeng.guns.modular.system.model.TServerCarmodel;
 import com.stylefeng.guns.modular.system.service.ITServerCarmodelService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.annotation.Resource;
 import java.util.Date;
 import java.util.Map;
 
@@ -30,21 +28,24 @@
 @Controller
 @RequestMapping("/tServerCarmodel")
 public class TServerCarmodelController extends BaseController {
-
-    private String PREFIX = "/system/tServerCarmodel/";
-
-    @Autowired
-    private ITServerCarmodelService tServerCarmodelService;
-
-    /**
-     * 跳转到快车车型设置首页
-     */
-    @RequestMapping("")
-    public String index() {
-        return PREFIX + "tServerCarmodel.html";
-    }
-
-    /**
+	
+	private String PREFIX = "/system/tServerCarmodel/";
+	
+	@Autowired
+	private ITServerCarmodelService tServerCarmodelService;
+	
+	@Resource
+	private ShiroExtUtil shiroExtUtil;
+	
+	/**
+	 * 跳转到快车车型设置首页
+	 */
+	@RequestMapping("")
+	public String index() {
+		return PREFIX + "tServerCarmodel.html";
+	}
+	
+	/**
      * 跳转到跨城车型设置首页
      */
     @RequestMapping("/acrossCity")
@@ -127,13 +128,13 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object list(String name,Integer state) {
-        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
-        if (ShiroExtUtil.getUser().getRoleType() != 1) {
-            page.setRecords(null);
-        } else {
-            page.setRecords(tServerCarmodelService.getServerCarModelList(page, 1, name, state));
-        }
-        return super.packForBT(page);
+	    Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+	    if (shiroExtUtil.getUser().getRoleType() != 1) {
+		    page.setRecords(null);
+	    } else {
+		    page.setRecords(tServerCarmodelService.getServerCarModelList(page, 1, name, state));
+	    }
+	    return super.packForBT(page);
     }
 
     /**
@@ -142,13 +143,13 @@
     @RequestMapping(value = "/listAcrossCity")
     @ResponseBody
     public Object listAcrossCity(String name,Integer state) {
-        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
-        if (ShiroExtUtil.getUser().getRoleType() != 1) {
-            page.setRecords(null);
-        } else {
-            page.setRecords(tServerCarmodelService.getServerCarModelList(page, 2, name, state));
-        }
-        return super.packForBT(page);
+	    Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+	    if (shiroExtUtil.getUser().getRoleType() != 1) {
+		    page.setRecords(null);
+	    } else {
+		    page.setRecords(tServerCarmodelService.getServerCarModelList(page, 2, name, state));
+	    }
+	    return super.packForBT(page);
     }
 
     /**
@@ -157,13 +158,13 @@
     @RequestMapping(value = "/listCharter")
     @ResponseBody
     public Object listCharter(String name,Integer state) {
-        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
-        if (ShiroExtUtil.getUser().getRoleType() != 1) {
-            page.setRecords(null);
-        } else {
-            page.setRecords(tServerCarmodelService.getServerCarModelList(page, 3, name, state));
-        }
-        return super.packForBT(page);
+	    Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+	    if (shiroExtUtil.getUser().getRoleType() != 1) {
+		    page.setRecords(null);
+	    } else {
+		    page.setRecords(tServerCarmodelService.getServerCarModelList(page, 3, name, state));
+	    }
+	    return super.packForBT(page);
     }
 
     /**

--
Gitblit v1.7.1