From a5ba2d61e3f3ee7c7b764fa684994c23c2dd1481 Mon Sep 17 00:00:00 2001
From: zty <1048209592@qq.com>
Date: Mon, 22 Jul 2024 14:17:44 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=AD=A3=E5=BA=A6=E5=AE=A1=E6=A0=B8=E7=9A=84?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=96=B9=E6=B3=95=EF=BC=8C=E4=B8=BB=E8=A6=81?=
 =?UTF-8?q?=E9=A2=86=E5=AF=BC=E9=A9=B3=E5=9B=9E=E6=97=B6=E8=A1=A5=E4=B8=8A?=
 =?UTF-8?q?=E5=88=86=E7=AE=A1=E9=A2=86=E5=AF=BC=E7=9A=84=E5=A7=94=E6=89=98?=
 =?UTF-8?q?=E4=BA=BA=202.=E9=A1=B9=E7=9B=AE=E5=AD=A3=E5=BA=A6=E6=8C=87?=
 =?UTF-8?q?=E6=A0=87=E7=9A=84=E6=97=B6=E5=80=99json=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE=E8=B4=9F=E8=B4=A3=E4=BA=BA?=
 =?UTF-8?q?id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/action/ProjectAssessmentIndicatorsController.java    | 1 +
 .../com/xqopen/kehui/project/action/ProjectInitComtroller.java   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/main/java/com/xqopen/kehui/project/action/ProjectAssessmentIndicatorsController.java b/src/main/java/com/xqopen/kehui/project/action/ProjectAssessmentIndicatorsController.java
index a7796c6..339be02 100644
--- a/src/main/java/com/xqopen/kehui/project/action/ProjectAssessmentIndicatorsController.java
+++ b/src/main/java/com/xqopen/kehui/project/action/ProjectAssessmentIndicatorsController.java
@@ -268,6 +268,7 @@ public class ProjectAssessmentIndicatorsController implements ProjectAssessmentI
 //                                    examine(userId, "流程结束", ext, "MainLeader", projectInfo);
                                 } else if ("1".equals(examine)) {
                                     map.put("taskName", "分管领导审核");
+                                    map.put("executor",ext.get("MainLeader"));
 //                                    examine(userId, "分管领导审核", ext, "branchLeaders", projectInfo);
                                 }
                             default:
diff --git a/src/main/java/com/xqopen/kehui/project/action/ProjectInitComtroller.java b/src/main/java/com/xqopen/kehui/project/action/ProjectInitComtroller.java
index 8284e60..49f72a3 100644
--- a/src/main/java/com/xqopen/kehui/project/action/ProjectInitComtroller.java
+++ b/src/main/java/com/xqopen/kehui/project/action/ProjectInitComtroller.java
@@ -149,6 +149,7 @@ public class ProjectInitComtroller implements ProjectInitApi {
                     JSONObject jsonObject = new JSONObject();
                     jsonObject.put("executor",getSystemUserLogin(projectManagerData).getId());//第一个节点执行人一定是项目负责人
                     jsonObject.put("taskName","季度审核填报");
+                    jsonObject.put("projectManager",jsonObject.get("executor"));
                     jsonObject.put("projectAdmin",getSystemUserLogin(projectAdmin).getId());
                     jsonObject.put("branchLeaders",getSystemUserLogin(branchLeaders).getId());
                     jsonObject.put("MainLeader",getSystemUserLogin(MainLeader).getId());