From 1b997e49979ec42dbb62671b0bc40f962de86955 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 11 四月 2025 19:39:17 +0800
Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang into dev
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java
index 70c7101..162decb 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java
@@ -582,7 +582,7 @@
}
// 查询合同信息
List<TContract> tContracts = contractMapper.selectList(Wrappers.<TContract>lambdaQuery()
- .in(TContract::getStatus, 2,3,4));
+ .in(TContract::getStatus, 2,3,4,9));
List<String> contractIds = tContracts.stream().map(TContract::getId).collect(Collectors.toList());
if(CollectionUtils.isEmpty(contractIds)){
return new PageInfo<>();
@@ -813,7 +813,7 @@
}
// 查询合同信息
List<TContract> tContracts = contractMapper.selectList(Wrappers.<TContract>lambdaQuery()
- .in(TContract::getStatus, 2,3,4));
+ .in(TContract::getStatus, 2,3,4,9));
List<String> contractIds = tContracts.stream().map(TContract::getId).collect(Collectors.toList());
if(CollectionUtils.isEmpty(contractIds)){
return new PageInfo<>();
@@ -1352,7 +1352,7 @@
stateTaskQuery.orderByDesc(FlwHisTask::getCreateTime);
}
List<TContract> tContracts = contractMapper.selectList(Wrappers.<TContract>lambdaQuery()
- .in(TContract::getStatus, 2,3,4));
+ .in(TContract::getStatus, 2,3,4,9));
List<String> contractIds = tContracts.stream().map(TContract::getId).collect(Collectors.toList());
if(CollectionUtils.isEmpty(contractIds)){
return new PageInfo<>();
--
Gitblit v1.7.1