Merge remote-tracking branch 'origin/test'

张志伟
2 parents 5a07eea4 89c3bbf3
Showing 1 changed file with 1 additions and 17 deletions
fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/follow/strategy/AbstractFollowStrategy.java
@@ -25,7 +25,6 @@ import cn.fw.shirasawa.rpc.member.dto.MemberUserDTO;
 import cn.fw.shirasawa.rpc.oop.OopService;
 import cn.fw.shirasawa.rpc.oop.dto.ShopDTO;
 import cn.fw.shirasawa.rpc.pstn.PstnRpcService;
-import cn.fw.shirasawa.sdk.enums.BusinessTypeEnum;
 import cn.fw.shirasawa.service.data.*;
 import cn.fw.shirasawa.service.event.CancelApproveEvent;
 import cn.fw.shirasawa.service.event.RecordCompleteEvent;
@@ -302,23 +301,8 @@ public abstract class AbstractFollowStrategy implements FollowStrategy {
     @Override
     public List<FollowRecordHistoryVO> queryHistoryByRecord(FollowRecord record) {
-        List<FollowRecordHistoryVO> list = new ArrayList<>();
-        if (BusinessTypeEnum.AS.equals(record.getBizType()) && !FollowTypeEnum.AC.equals(record.getType()) && !FollowTypeEnum.AF.equals(record.getType())) {
-            List<FollowTask> taskList = followTaskService.list(Wrappers.<FollowTask>lambdaQuery()
-                    .eq(FollowTask::getType, record.getType())
-                    .eq(FollowTask::getBizId, record.getBizId())
-                    .eq(FollowTask::getGroupId, record.getGroupId())
-                    .ge(FollowTask::getCloseTime, LocalDateTime.now().minusMonths(2L))
-                    .ne(FollowTask::getId, record.getTaskId())
-            );
-            if (!CollectionUtils.isEmpty(taskList)) {
-                for (FollowTask followTask : taskList) {
-                    list.addAll(queryHistoryByTask(followTask));
-                }
-            }
-        }
         FollowTask task = followTaskService.getById(record.getTaskId());
-        list.addAll(queryHistoryByTask(task));
+        List<FollowRecordHistoryVO> list = new ArrayList<>(queryHistoryByTask(task));
         return list.stream().sorted((a, b) -> b.getId().compareTo(a.getId())).collect(Collectors.toList());
     }