From a0af42a6acfc7a0ebbb92bffc1816525e508af70 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 17 十月 2025 16:54:06 +0800
Subject: [PATCH] 修改bug
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TActivityController.java | 55 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 33 insertions(+), 22 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TActivityController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TActivityController.java
index f5aa9d1..d8b8081 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TActivityController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TActivityController.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
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.log.LogObjectHolder;
import com.stylefeng.guns.core.shiro.ShiroKit;
@@ -60,14 +61,17 @@
private RedisUtil redisUtil;
@Autowired
private ITUserToCouponService userToCouponService;
+
+ @Autowired
+ private ShiroExtUtil shiroExtUtil;
/**
* 跳转到首页
*/
@RequestMapping("")
public String index(Model model) {
// 查询当前帐号的省市区
- Integer objectId = ShiroKit.getUser().getObjectId();
- Integer roleType = ShiroKit.getUser().getRoleType();
+ Integer objectId = shiroExtUtil.getUser().getObjectId();
+ Integer roleType = shiroExtUtil.getUser().getRoleType();
if(roleType == 1){
List<TBranchOfficeArea> branchOfficeAreaList = branchOfficeAreaService.selectList(new EntityWrapper<TBranchOfficeArea>());
if(CollectionUtils.isEmpty(branchOfficeAreaList)){
@@ -101,10 +105,17 @@
@RequestMapping("/activity_add")
public String activityAdd(Model model) {
// 查询当前帐号的省市区
- Integer objectId = ShiroKit.getUser().getObjectId();
- Integer roleType = ShiroKit.getUser().getRoleType();
+ Integer objectId = shiroExtUtil.getUser().getObjectId();
+ Integer roleType = shiroExtUtil.getUser().getRoleType();
if(roleType == 1){
- List<TBranchOfficeArea> branchOfficeAreaList = branchOfficeAreaService.selectList(new EntityWrapper<TBranchOfficeArea>());
+ List<TBranchOffice> branchOffices = branchOfficeService.selectList(new EntityWrapper<TBranchOffice>().eq("status", 1));
+ List<Integer> collect = new ArrayList<>();
+ if(branchOffices.size() == 0){
+ collect.add(-1);
+ }else{
+ collect = branchOffices.stream().map(TBranchOffice::getId).collect(Collectors.toList());
+ }
+ List<TBranchOfficeArea> branchOfficeAreaList = branchOfficeAreaService.selectList(new EntityWrapper<TBranchOfficeArea>().in("branchOfficeId", collect));
if(CollectionUtils.isEmpty(branchOfficeAreaList)){
model.addAttribute("provinceList",new ArrayList<>());
}
@@ -136,8 +147,8 @@
@RequestMapping("/openAuditDetail/{id}")
public String openAuditDetail(@PathVariable Integer id,Model model) {
// 查询当前帐号的省市区
- Integer objectId = ShiroKit.getUser().getObjectId();
- Integer roleType = ShiroKit.getUser().getRoleType();
+ Integer objectId = shiroExtUtil.getUser().getObjectId();
+ Integer roleType = shiroExtUtil.getUser().getRoleType();
if(roleType == 1){
List<TBranchOfficeArea> branchOfficeAreaList = branchOfficeAreaService.selectList(new EntityWrapper<TBranchOfficeArea>());
if(CollectionUtils.isEmpty(branchOfficeAreaList)){
@@ -214,8 +225,8 @@
@RequestMapping("/openDetail/{id}")
public String openDetail(@PathVariable Integer id,Model model) {
// 查询当前帐号的省市区
- Integer objectId = ShiroKit.getUser().getObjectId();
- Integer roleType = ShiroKit.getUser().getRoleType();
+ Integer objectId = shiroExtUtil.getUser().getObjectId();
+ Integer roleType = shiroExtUtil.getUser().getRoleType();
if(roleType == 1){
List<TBranchOfficeArea> branchOfficeAreaList = branchOfficeAreaService.selectList(new EntityWrapper<TBranchOfficeArea>());
if(CollectionUtils.isEmpty(branchOfficeAreaList)){
@@ -355,8 +366,8 @@
@RequestMapping("/activity_update/{id}")
public String activityUpdate(@PathVariable("id") Integer id, Model model) {
// 查询当前帐号的省市区
- Integer objectId = ShiroKit.getUser().getObjectId();
- Integer roleType = ShiroKit.getUser().getRoleType();
+ Integer objectId = shiroExtUtil.getUser().getObjectId();
+ Integer roleType = shiroExtUtil.getUser().getRoleType();
if(roleType == 1){
List<TBranchOfficeArea> branchOfficeAreaList = branchOfficeAreaService.selectList(new EntityWrapper<TBranchOfficeArea>());
if(CollectionUtils.isEmpty(branchOfficeAreaList)){
@@ -455,7 +466,7 @@
@ResponseBody
public Object list(String createTime,String branchOfficeName,String activityName,
String activityAreaCode,Integer status) {
- ShiroUser user = ShiroKit.getUser();
+ ShiroUser user = shiroExtUtil.getUser();
String beginTime = null;
String endTime = null;
if (SinataUtil.isNotEmpty(createTime)){
@@ -489,7 +500,7 @@
TActivity activity = activityService.selectById(id);
activity.setStatus(status);
activity.setAuditRemark(auditRemark);
- activity.setAuditPeople(ShiroKit.getUser().getName());
+ activity.setAuditPeople(shiroExtUtil.getUser().getName());
activity.setAuditTime(new Date());
activityService.updateById(activity);
return SUCCESS_TIP;
@@ -497,8 +508,8 @@
@RequestMapping(value = "/change")
@ResponseBody
public Object change(@RequestParam Integer code) {
- Integer objectId = ShiroKit.getUser().getObjectId();
- Integer roleType = ShiroKit.getUser().getRoleType();
+ Integer objectId = shiroExtUtil.getUser().getObjectId();
+ Integer roleType = shiroExtUtil.getUser().getRoleType();
List<TBranchOfficeArea> list = new ArrayList<>();
if (SinataUtil.isNotEmpty(code)){
EntityWrapper<TBranchOfficeArea> wrapper = new EntityWrapper<>();
@@ -515,8 +526,8 @@
@RequestMapping(value = "/change1")
@ResponseBody
public Object change1(@RequestParam Integer code) {
- Integer objectId = ShiroKit.getUser().getObjectId();
- Integer roleType = ShiroKit.getUser().getRoleType();
+ Integer objectId = shiroExtUtil.getUser().getObjectId();
+ Integer roleType = shiroExtUtil.getUser().getRoleType();
List<TBranchOfficeArea> list = new ArrayList<>();
if (SinataUtil.isNotEmpty(code)){
EntityWrapper<TBranchOfficeArea> wrapper = new EntityWrapper<>();
@@ -537,12 +548,12 @@
@RequestMapping(value = "/add")
@ResponseBody
public Object add(TActivity activity,String subArr, String subArr1) {
- Integer objectId = ShiroKit.getUser().getObjectId();
- Integer roleType = ShiroKit.getUser().getRoleType();
+ Integer objectId = shiroExtUtil.getUser().getObjectId();
+ Integer roleType = shiroExtUtil.getUser().getRoleType();
activity.setCompanyId(objectId);
activity.setCompanyType(roleType);
activity.setCreateTime(new Date());
- activity.setCreateBy(ShiroKit.getUser().getName());
+ activity.setCreateBy(shiroExtUtil.getUser().getName());
activityService.insert(activity);
addActivity(subArr1,activity.getId());
addScope(subArr,activity.getId());
@@ -629,8 +640,8 @@
@RequestMapping(value = "/update")
@ResponseBody
public Object update(TActivity activity,String subArr, String subArr1,Integer id) {
-// Integer objectId = ShiroKit.getUser().getObjectId();
-// Integer roleType = ShiroKit.getUser().getRoleType();
+// Integer objectId = shiroExtUtil.getUser().getObjectId();
+// Integer roleType = shiroExtUtil.getUser().getRoleType();
// activity.setCompanyId(objectId);
// activity.setCompanyType(roleType);
activity.setStatus(1);
--
Gitblit v1.7.1