From 156e141e55a8abf486157d1fa89d25e23f4a06a3 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 25 八月 2023 19:32:30 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java
index 259f94c..6051fdd 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java
@@ -648,7 +648,11 @@
*/
@Override
public List<MgtActivityListVo> listStaffActivity(StaffActivityListDto staffActivityListDto){
- return activityMapper.listStaffActivity(staffActivityListDto);
+ List<MgtActivityListVo> activityListVoList = new ArrayList<>();
+ if(staffActivityListDto.getActivityFrom()!=null&&staffActivityListDto.getActivityFrom()==1){
+ activityListVoList = activityMapper.listStaffActivity(staffActivityListDto);
+ }
+ return activityListVoList;
}
}
--
Gitblit v1.7.1