wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package 

# Conflicts:
#	renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java
This commit is contained in:
wangliwen 2022-12-05 11:59:54 +08:00
parent 1d33f23fc3 7ecfad7e81
commit 54d0ca1ecf
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java
View File

@ -392,9 +392,7 @@ public class TAbilityApplicationController {
.list() .list()
.stream() .stream()
.findFirst(); // 尝试获取当前task .findFirst(); // 尝试获取当前task
if (nowTask.isPresent() if (nowTask.isPresent()) { // 存在正在进行的任务
// && nowTask.get().getId().equals(index_.getTaskId())
) { // 存在正在进行的任务
logger.info("该流程最新task:" + nowTask.get().getId()); logger.info("该流程最新task:" + nowTask.get().getId());
LocalDate localDate = tRemindersService.selectRemindersTime(nowTask.get().getId()); LocalDate localDate = tRemindersService.selectRemindersTime(nowTask.get().getId());
if (localDate == null) { // 最新流程未进行过催办 if (localDate == null) { // 最新流程未进行过催办