Commit ff468e9700fed204570ead5e8864cf63842acca2
Merge remote-tracking branch 'origin/dev' into test
Showing
1 changed file
with
3 additions
and
0 deletions
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/PoolBizService.java
| @@ -153,6 +153,9 @@ public class PoolBizService { | @@ -153,6 +153,9 @@ public class PoolBizService { | ||
| 153 | public AppPage<CustomerCluePoolVO> clueList(CustomerCluePoolQueryVO queryVO) { | 153 | public AppPage<CustomerCluePoolVO> clueList(CustomerCluePoolQueryVO queryVO) { |
| 154 | prepareParams(null, queryVO); | 154 | prepareParams(null, queryVO); |
| 155 | BV.isNotEmpty(queryVO.getScope(), () -> "人员权限范围不正确，请确认是否有管理权限"); | 155 | BV.isNotEmpty(queryVO.getScope(), () -> "人员权限范围不正确，请确认是否有管理权限"); |
| 156 | + if (ClueStatusEnum.ONGOING.getValue().equals(queryVO.getStatus())) { | ||
| 157 | + queryVO.setCloseTime(null); | ||
| 158 | + } | ||
| 156 | AppPageVO<CustomerCluePoolVO> page = AppPageVO.init(queryVO); | 159 | AppPageVO<CustomerCluePoolVO> page = AppPageVO.init(queryVO); |
| 157 | long total = cluePoolService.clueListCount(queryVO); | 160 | long total = cluePoolService.clueListCount(queryVO); |
| 158 | if (total <= 0) { | 161 | if (total <= 0) { |