From 1c5a3595da7d4928614e80e57219ce68212cce7b Mon Sep 17 00:00:00 2001
From: chen <2280784283@qq.com>
Date: Mon, 5 Aug 2024 15:37:28 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=B0=86=E7=AE=A1=E7=90=86=E5=91=98=E7=9A=84?=
 =?UTF-8?q?id=E6=94=B9=E4=B8=BA=E4=BA=BA=E4=BA=8Bid=202.=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=91=A8=E6=8A=A5=E6=97=B6,=E8=87=AA=E5=8A=A8=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E9=A1=B9=E7=9B=AE=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/action/ProjectWeeklyController.java      | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java b/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java
index 509c700..035cf80 100644
--- a/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java
+++ b/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java
@@ -161,8 +161,13 @@ public class ProjectWeeklyController implements ProjectWeeklyApi {
         //获取projectManagerData
         JSONArray projectManagerData = extInfo.getJSONArray("projectManagerData");
         JSONArray projectAdmin = extInfo.getJSONArray("projectAdmin");
+        // 将projectAdmin改为人事id
+        EntityWrapper<SystemUserLogin> userLoginEntityWrapper = new EntityWrapper<>();
+        userLoginEntityWrapper.eq("id_", projectAdmin.getString(projectAdmin.toArray().length -1 ));
+        SystemUserLogin systemUserLogin = systemUserLoginService.selectOne(userLoginEntityWrapper);
+
         ext.put("projectManagerData",projectManagerData.getString(projectManagerData.toArray().length -1 ));
-        ext.put("projectAdmin",projectAdmin.getString(projectAdmin.toArray().length -1 ));
+        ext.put("projectAdmin",systemUserLogin.getUserinfoId());
         ext.put("draftManId",extInfo.getString("draftManId"));
         return ext;
     }
@@ -270,20 +275,17 @@ public class ProjectWeeklyController implements ProjectWeeklyApi {
                 // 根据编号,名称查询是否存在
                 for (ProjectWeeklyList list : membersList) {
                     String projectName = list.getProjectName();
-                    String projectNo = list.getProjectNo();
                     EntityWrapper<ProjectInfo> wrapper = new EntityWrapper<>();
-                    if (!StringUtils.isEmpty(projectNo)) wrapper.eq("project_no", projectNo);
                     if (!StringUtils.isEmpty(projectName)) wrapper.eq("project_name", projectName);
                     wrapper.eq("is_deleted", false);
                     wrapper.eq("project_category", "init");
                     ProjectInfo project = projectInfoService.selectOne(wrapper);
 
-                    if (ObjectUtils.isEmpty(project)) return ApiResponse.fillFail("你输入的项目编号/名称不存在！");
+                    if (ObjectUtils.isEmpty(project)) return ApiResponse.fillFail("你输入的项目名称不存在！");
                     ProjectWeekly projectWeekly = new ProjectWeekly();
                     projectWeekly.setProjectId(String.valueOf(project.getId()));
                     //将项目专员和项目负责人id 存入Weekly中
                     JSONObject ext = getExt(project,projectInfoReq);
-                    ext.put("projectNo",projectNo);
                     ext.put("projectName",projectName);
                     projectWeekly.setExt(ext);