valhalla / fw-shirasawa

Commit 4a5601ad2ed2fc9a948a1160da7b3d956494b359

Authored by 张志伟
2 parents e3a3b22b e442ad67

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

Inline Side-by-side
Showing 1 changed file with 1 additions and 1 deletions
fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/follow/strategy/AbstractFollowStrategy.java
  View file @4a5601a
@@ -303,7 +303,7 @@ public abstract class AbstractFollowStrategy implements FollowStrategy { @@ -303,7 +303,7 @@ public abstract class AbstractFollowStrategy implements FollowStrategy {
303 @Override 303 @Override
304 public List<FollowRecordHistoryVO> queryHistoryByRecord(FollowRecord record) { 304 public List<FollowRecordHistoryVO> queryHistoryByRecord(FollowRecord record) {
305 List<FollowRecordHistoryVO> list = new ArrayList<>(); 305 List<FollowRecordHistoryVO> list = new ArrayList<>();
306 - if (BusinessTypeEnum.AS.equals(record.getBizType()) && !FollowTypeEnum.AC.equals(record.getType())) { 306 + if (BusinessTypeEnum.AS.equals(record.getBizType()) && !FollowTypeEnum.AC.equals(record.getType()) && !FollowTypeEnum.AF.equals(record.getType())) {
307 List<FollowTask> taskList = followTaskService.list(Wrappers.<FollowTask>lambdaQuery() 307 List<FollowTask> taskList = followTaskService.list(Wrappers.<FollowTask>lambdaQuery()
308 .eq(FollowTask::getType, record.getType()) 308 .eq(FollowTask::getType, record.getType())
309 .eq(FollowTask::getBizId, record.getBizId()) 309 .eq(FollowTask::getBizId, record.getBizId())