Commit 7e5e0933ab28b9f70c9ea23aee1a2c2df70e83eb

Authored by 张志伟
2 parents cef7c485 77508697

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

fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/PoolBizService.java
... ... @@ -240,8 +240,9 @@ public class PoolBizService {
240 240 if (ClueStatusEnum.COMPLETE.getValue().equals(poolDTO.getClueStatus()) && scope.contains(poolDTO.getFinishShopId())) {
241 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 246 vo.setStatus(ClueStatusEnum.FAILURE.getValue());
246 247 }
247 248 //首保
... ...