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/general/TInvoiceController.java | 39 +++++++++++++++++++++------------------ 1 files changed, 21 insertions(+), 18 deletions(-) diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TInvoiceController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TInvoiceController.java index b829a02..d2a1f9a 100644 --- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TInvoiceController.java +++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TInvoiceController.java @@ -2,21 +2,21 @@ 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.TComplaint; -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.core.util.SinataUtil; import com.stylefeng.guns.modular.system.model.TInvoice; import com.stylefeng.guns.modular.system.service.ITInvoiceService; +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 +28,15 @@ @Controller @RequestMapping("/tInvoice") public class TInvoiceController extends BaseController { - + private String PREFIX = "/system/tInvoice/"; - + @Autowired private ITInvoiceService tInvoiceService; - + + @Resource + private ShiroExtUtil shiroExtUtil; + /** * 跳转到开发票列表首页 */ @@ -41,7 +44,7 @@ public String index() { return PREFIX + "tInvoice.html"; } - + /** * 跳转到查看详情 */ @@ -87,16 +90,16 @@ 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(tInvoiceService.getInvoiceList(page,beginTime,endTime,email,name,type,state)); + } else { + page.setRecords(tInvoiceService.getInvoiceList(page, beginTime, endTime, email, name, type, state)); } return super.packForBT(page); } -- Gitblit v1.7.1