From e05a23efb37cb1aa5f6a8187ab1f45bc8d3dc426 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 21 七月 2021 18:21:51 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenServiceImpl.java
index 28a2e6d..9e222b5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenServiceImpl.java
@@ -15,6 +15,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -76,7 +77,7 @@
@Override
public R<List<PartyBuildingMemberVO>> bigscreenPartyactivitytopuser(Long communityId) {
List<PartyBuildingMemberVO> listRt = bigScreenDAO.bigscreenPartyactivitytopuser(communityId);
- if(listRt==null || listRt.size()< 0){
+ if(listRt==null || listRt.size()< 3){
//选择默认的党员列表
List<PartyBuildingMemberVO> defaultPartyactivity = bigScreenDAO.defaultPartyactivity(communityId);
listRt.addAll(defaultPartyactivity);
@@ -89,7 +90,12 @@
@Override
public R<List<BigScreenStatisticPartyActivity>> bigscreenPartyactivity(BigScreenStatisticPartyActivityDTO bigScreenStatisticPartyActivityDTO) {
- List<BigScreenStatisticPartyActivity> listR = bigScreenDAO.partyactivity(bigScreenStatisticPartyActivityDTO);
+ List<BigScreenStatisticPartyActivity> listR = new ArrayList<>();
+ if(bigScreenStatisticPartyActivityDTO.getType().equals(3)){
+ listR = bigScreenDAO.partyactivity(bigScreenStatisticPartyActivityDTO);
+ }else if(bigScreenStatisticPartyActivityDTO.getType().equals(2)){
+ listR = bigScreenDAO.partyactivityByWeek(bigScreenStatisticPartyActivityDTO);
+ }
return R.ok(listR);
}
--
Gitblit v1.7.1