submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/settle/service/impl/ITopInstSettleServiceImpl.java

@@ -1120,6 +1120,17 @@ public class ITopInstSettleServiceImpl extends ServiceImpl<TopInstSettleMapper,
         if (CollectionUtils.isEmpty(settleRoleList)){
             return checkLog;
         }
+        List<TopOldOrderCheckLog> logs = topOldOrderCheckLogService
+                        .list(new LambdaQueryWrapper<TopOldOrderCheckLog>()
+                        .eq(TopOldOrderCheckLog::getOrderSn, settleSn)
+                        .eq(TopOldOrderCheckLog::getCheckFrom, 5));
+        if (CollectionUtils.isNotEmpty(logs)){
+            TopOldOrderCheckLog checkLog1 = logs.stream().max(Comparator.comparing(TopOldOrderCheckLog::getCheckSort)).get();
+            if (sort >= checkLog1.getCheckSort()){
+                return checkLog;
+            }
+        }
+
         List<Long> roleIds = settleRoleList.stream().map(TopSysUserRole::getRoleId).collect(Collectors.toList());
         if (roleIds.stream().anyMatch(x -> x.equals(checkLog.getRoleId()))){
             getNextCheck(settleRoleList,sort + 1,settleSn);