From 0467d32f9b7f81ae1eaf4a924ce36ade239f7f64 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Tue, 4 Apr 2023 15:46:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E9=80=BB=E8=BE=91=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pmapi/projectdeclared/manage/DeclaredProjectManage.java          | 4 ++--
 .../com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java     | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DeclaredProjectManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DeclaredProjectManage.java
index 5d21e23..aa11d8e 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DeclaredProjectManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DeclaredProjectManage.java
@@ -293,8 +293,8 @@ public class DeclaredProjectManage {
             projectInst.setInstType(ProjectProcessStageEnum.ORG_INTERNAL_APPROVAL_PROCESS.getCode());
             projectInstService.save(projectInst);
         } catch (Exception e) {
-            log.error("项目信息入库错误 ", e);
-            throw new BusinessException("项目信息入库错误 :" + e.getMessage());
+            log.error("项目信息入库错误 " + e);
+            throw new BusinessException("项目信息入库错误 :" + e);
         }
         return Boolean.TRUE;
     }
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java
index 120c622..4dadbf6 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java
@@ -177,7 +177,12 @@ public class TodoCenterManage {
         req.setProcessDefId(param.getProcessDefId());
         req.setUserId(String.valueOf(userId));
         req.setEmployeeCode(employeeCode);
+        //有待办节点的(不包含退回)
         List<ProcessTaskVo> todoList = processTaskService.getUserTodoList(req);
+        //有退回待办的
+        List<ProcessTaskVo> backList = processTaskService.getBackTodoList(req);
+        todoList.addAll(backList);
+        todoList.stream().sorted(Comparator.comparing(ProcessTaskVo::getTaskCreateTime).reversed());
 
         if (CollUtil.isEmpty(todoList)) {
             return PageVo.empty();