From 1c40baaf9ca0183945b9881d11ceed5aeebc8290 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 23 十月 2025 11:35:44 +0800
Subject: [PATCH] 修改bug
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java | 38 ++++++++++++++++++++------------------
1 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java
index 6259cfc..c29c143 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java
@@ -2,21 +2,20 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
-import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.SinataUtil;
-import com.stylefeng.guns.modular.system.model.TOrderCharter;
-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.TIntegralOrder;
import com.stylefeng.guns.modular.system.service.ITIntegralOrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+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.Map;
/**
@@ -28,12 +27,15 @@
@Controller
@RequestMapping("/tIntegralOrder")
public class TIntegralOrderController extends BaseController {
-
+
private String PREFIX = "/system/tIntegralOrder/";
-
+
@Autowired
private ITIntegralOrderService tIntegralOrderService;
-
+
+ @Autowired
+ private ShiroExtUtil shiroExtUtil;
+
/**
* 跳转到积分兑换订单首页
*/
@@ -41,7 +43,7 @@
public String index() {
return PREFIX + "tIntegralOrder.html";
}
-
+
/**
* 跳转到查看详情
*/
@@ -69,16 +71,16 @@
public Object list(String insertTime,String userName,String goodsName,String consigneeName,String consigneePhone,Integer state) {
String beginTime = null;
String endTime = null;
- if (SinataUtil.isNotEmpty(insertTime)){
+ if (SinataUtil.isNotEmpty(insertTime)) {
String[] timeArray = insertTime.split(" - ");
beginTime = timeArray[0];
endTime = timeArray[1];
}
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- if (ShiroKit.getUser().getRoleType() != 1){
+ if (shiroExtUtil.getUser().getRoleType() != 1) {
page.setRecords(null);
- }else{
- page.setRecords(tIntegralOrderService.getIntegralOrderList(page,beginTime,endTime,userName,goodsName,consigneeName,consigneePhone,state));
+ } else {
+ page.setRecords(tIntegralOrderService.getIntegralOrderList(page, beginTime, endTime, userName, goodsName, consigneeName, consigneePhone, state));
}
return super.packForBT(page);
}
--
Gitblit v1.7.1