From 821fc2f632f8b974a2c0fc37630e13c5fbe6086c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 26 九月 2025 17:26:16 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityServiceImpl.java | 25 +++++--------------------
1 files changed, 5 insertions(+), 20 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityServiceImpl.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityServiceImpl.java
index 6e49bfd..279ce39 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityServiceImpl.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityServiceImpl.java
@@ -308,27 +308,12 @@
@Override
public Map<String, Object> queryUserActivityList(Integer uid, Date start, Date end, String name, Integer status, Integer offset, Integer limit) {
Map<String, Object> map = new HashMap<>();
- Integer objectId = userService.selectById(uid).getObjectId();
- boolean a = false;
- if (status!=null&&status==5){
- status = null;
- a = true;
+ Integer companyId = null;
+ if(1 != ShiroKit.getUser().getRoleType()){
+ companyId = ShiroKit.getUser().getObjectId();
}
- List<Map<String, Object>> list = userActivityMapper.queryUserActivityList(objectId, start, end, name, status, offset, limit);
- int i = userActivityMapper.queryUserActivityListCount(objectId, start, end, name, status);
- if (a){
- List<Map<String, Object>> list1 = new ArrayList<>();
- for (Map<String, Object> stringObjectMap : list) {
- long statys = (long) stringObjectMap.get("status");
- System.out.println(statys);
- if (statys==6){
- list1.add(stringObjectMap);
- }
- }
- map.put("rows", list1);
- map.put("total", list1.size());
- return map;
- }
+ List<Map<String, Object>> list = userActivityMapper.queryUserActivityList(companyId, start, end, name, status, offset, limit);
+ int i = userActivityMapper.queryUserActivityListCount(companyId, start, end, name, status);
map.put("rows", list);
map.put("total", i);
return map;
--
Gitblit v1.7.1