From d59956a6d7b12d122f7dbdfaecd46688697e6be0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 23 二月 2024 14:56:47 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityServiceImpl.java | 18 ------------------
1 files changed, 0 insertions(+), 18 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..0cd525e 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
@@ -309,26 +309,8 @@
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;
- }
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;
- }
map.put("rows", list);
map.put("total", i);
return map;
--
Gitblit v1.7.1