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 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 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);