Commit a074bec14065f72babcc0bd4ef19713517b95fe6

Authored by 张志伟
2 parents 555d625a 7e5e0933

Merge remote-tracking branch 'origin/test'

fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/PoolBizService.java
@@ -240,8 +240,9 @@ public class PoolBizService { @@ -240,8 +240,9 @@ public class PoolBizService {
240 if (ClueStatusEnum.COMPLETE.getValue().equals(poolDTO.getClueStatus()) && scope.contains(poolDTO.getFinishShopId())) { 240 if (ClueStatusEnum.COMPLETE.getValue().equals(poolDTO.getClueStatus()) && scope.contains(poolDTO.getFinishShopId())) {
241 vo.setStatus(ClueStatusEnum.COMPLETE.getValue()); 241 vo.setStatus(ClueStatusEnum.COMPLETE.getValue());
242 } 242 }
243 - if (ClueStatusEnum.FAILURE.getValue().equals(poolDTO.getClueStatus()) ||  
244 - (Objects.nonNull(poolDTO.getFinishShopId()) && !scope.contains(poolDTO.getFinishShopId()))) { 243 + boolean bool = ClueStatusEnum.FAILURE.getValue().equals(poolDTO.getClueStatus()) ||
  244 + (Objects.nonNull(poolDTO.getFinishShopId()) && !scope.contains(poolDTO.getFinishShopId()));
  245 + if (bool) {
245 vo.setStatus(ClueStatusEnum.FAILURE.getValue()); 246 vo.setStatus(ClueStatusEnum.FAILURE.getValue());
246 } 247 }
247 //首保 248 //首保