Merge remote-tracking branch 'origin/dev' into test

张志伟
2 parents 2530563b 14a1148d
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 {
     public AppPage<CustomerCluePoolVO> clueList(CustomerCluePoolQueryVO queryVO) {
         prepareParams(null, queryVO);
         BV.isNotEmpty(queryVO.getScope(), () -> "人员权限范围不正确，请确认是否有管理权限");
+        if (ClueStatusEnum.ONGOING.getValue().equals(queryVO.getStatus())) {
+            queryVO.setCloseTime(null);
+        }
         AppPageVO<CustomerCluePoolVO> page = AppPageVO.init(queryVO);
         long total = cluePoolService.clueListCount(queryVO);
         if (total <= 0) {