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; } }