KPI / fw-morax

Commit 3967df80ac4ae95cf1249a2212cd7d09285dc7d0

Authored by 姜超
2 parents 9ee2c2d2 86d84d00

Merge branch 'test' into 'main' 

feature(*): 查询列表修改

查询列表修改

See merge request !123
Inline Side-by-side
Showing 1 changed file with 8 additions and 4 deletions
fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalGroupRankBizService.java
  View file @3967df8
... ... @@ -78,10 +78,14 @@ public class EvalGroupRankBizService {
78 78 epiGroupRankVO.setShopIds(new ArrayList<>());
79 79 epiGroupRankVO.setShopNames(new HashSet<>());
80 80 for (EvalGroup evalGroup : egcGroupMap.getOrDefault(epiGroupRankVO.getId(), new ArrayList<>())) {
81   - epiGroupRankVO.getPostIds().addAll(evalGroup.getPostIds());
82   - epiGroupRankVO.getPostNames().addAll(evalGroup.getPostNames());
83   - epiGroupRankVO.getShopIds().addAll(evalGroup.getShopIds());
84   - epiGroupRankVO.getShopNames().addAll(evalGroup.getShopNames());
  81 + if (PublicUtil.isNotEmpty(evalGroup.getPostIds())) {
  82 + epiGroupRankVO.getPostIds().addAll(evalGroup.getPostIds());
  83 + epiGroupRankVO.getPostNames().addAll(evalGroup.getPostNames());
  84 + }
  85 + if (PublicUtil.isNotEmpty(evalGroup.getShopIds())) {
  86 + epiGroupRankVO.getShopIds().addAll(evalGroup.getShopIds());
  87 + epiGroupRankVO.getShopNames().addAll(evalGroup.getShopNames());
  88 + }
85 89 }
86 90 }
87 91 page.setTotal(total);
... ...