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/SysRedPacketRecordController.java | 56 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 30 insertions(+), 26 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java
index 0cbf31a..31067d8 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java
@@ -4,23 +4,23 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
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.util.DateUtil;
-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.SysRedPacketRecord;
import com.stylefeng.guns.modular.system.service.ISysRedPacketRecordService;
+import com.stylefeng.guns.modular.system.util.DateUtil;
+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.Date;
-import java.util.Map;
/**
* 控制器
@@ -31,12 +31,16 @@
@Controller
@RequestMapping("/sysRedPacketRecord")
public class SysRedPacketRecordController extends BaseController {
-
+
private String PREFIX = "/system/sysRedPacketRecord/";
-
+
@Autowired
private ISysRedPacketRecordService sysRedPacketRecordService;
-
+
+ @Resource
+ private ShiroExtUtil shiroExtUtil;
+
+
/**
* 跳转到首页
*/
@@ -44,7 +48,7 @@
public String index() {
return PREFIX + "sysRedPacketRecord.html";
}
-
+
/**
* 跳转到添加
*/
@@ -72,20 +76,20 @@
public Object list(String createTime) {
Date startTimes = null;
Date endTimes = null;
- if (SinataUtil.isNotEmpty(createTime)){
+ if (SinataUtil.isNotEmpty(createTime)) {
String[] timeArray = createTime.split(" - ");
- startTimes = DateUtil.getDate_str3(timeArray[0]+" 00:00:00");
- endTimes = DateUtil.getDate_str3(timeArray[1]+" 23:59:59");
+ startTimes = DateUtil.getDate_str3(timeArray[0] + " 00:00:00");
+ endTimes = DateUtil.getDate_str3(timeArray[1] + " 23:59:59");
}
Page<SysRedPacketRecord> page = new PageFactory<SysRedPacketRecord>().defaultPage();
Wrapper wrapper = new EntityWrapper<SysRedPacketRecord>();
- if(SinataUtil.isNotEmpty(createTime)){
- wrapper.between("insertTime",startTimes,endTimes);
+ if (SinataUtil.isNotEmpty(createTime)) {
+ wrapper.between("insertTime", startTimes, endTimes);
}
- wrapper.eq("companyId",ShiroKit.getUser().getObjectId());
- wrapper.eq("companyType",ShiroKit.getUser().getRoleType());
- wrapper.orderBy("id",false);
- return super.packForBT(sysRedPacketRecordService.selectPage(page,wrapper));
+ wrapper.eq("companyId", shiroExtUtil.getUser().getObjectId());
+ wrapper.eq("companyType", shiroExtUtil.getUser().getRoleType());
+ wrapper.orderBy("id", false);
+ return super.packForBT(sysRedPacketRecordService.selectPage(page, wrapper));
}
/**
@@ -95,8 +99,8 @@
@ResponseBody
public Object add(SysRedPacketRecord sysRedPacketRecord) {
sysRedPacketRecord.setInsertTime(new Date());
- sysRedPacketRecord.setCompanyId(ShiroKit.getUser().getObjectId());
- sysRedPacketRecord.setCompanyType(ShiroKit.getUser().getRoleType());
+ sysRedPacketRecord.setCompanyId(shiroExtUtil.getUser().getObjectId());
+ sysRedPacketRecord.setCompanyType(shiroExtUtil.getUser().getRoleType());
sysRedPacketRecordService.insert(sysRedPacketRecord);
return SUCCESS_TIP;
}
--
Gitblit v1.7.1