valhalla / fw-valhalla

Commit 9f902e9780164e7b1287ce6cb1a72847d7735f6d

Authored by 张志伟
1 parent 9c3c6515

:fire: feat(*): 调整查询 

- 调整线索查询
Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/PoolBizService.java
  View file @9f902e9
... ... @@ -351,8 +351,8 @@ public class PoolBizService {
351 351 .eq(FollowClue::getClueType, queryVO.getType())
352 352 .in(FollowClue::getClueState, clueStatusList)
353 353 .and(w1 -> w1.isNull(FollowClue::getCloseTime)
354   - .or(w2 -> w2.gt(Objects.nonNull(queryVO.getCloseTime1()), FollowClue::getCloseTime, queryVO.getCloseTime1())
355   - .lt(Objects.nonNull(queryVO.getCloseTime2()), FollowClue::getCloseTime, queryVO.getCloseTime2()))
  354 + .or(w2 -> w2.ge(Objects.nonNull(queryVO.getCloseTime1()), FollowClue::getCloseTime, queryVO.getCloseTime1())
  355 + .le(Objects.nonNull(queryVO.getCloseTime2()), FollowClue::getCloseTime, queryVO.getCloseTime2()))
356 356 ));
357 357 if (!CollectionUtils.isEmpty(list)) {
358 358 Set<Long> set = list.stream().map(FollowClue::getId).collect(Collectors.toSet());
... ...