|
@@ -323,18 +323,21 @@ public class ProjectMemberController {
|
|
|
if (Check.isNull(projectId)) {
|
|
|
throw new Exception("请选择项目");
|
|
|
}
|
|
|
- String projectName = jsonObject.getString("projectName");
|
|
|
+ Project project = projectService.getById(projectId);
|
|
|
+ if(Check.isNull(project)){
|
|
|
+ throw new Exception("项目不存在");
|
|
|
+ }
|
|
|
JSONArray memberArr = jsonObject.getJSONArray("memberArr");
|
|
|
if (Check.isNull(memberArr)) {
|
|
|
throw new Exception("请选择项目成员");
|
|
|
}
|
|
|
for (int i = 0; i < memberArr.size(); i++) {
|
|
|
- String userId = memberArr.get(i).toString();
|
|
|
+ String userId = memberArr.getString(i);
|
|
|
if (!Check.isNull(userId)) {
|
|
|
QueryWrapper<ProjectMember> queryWrapper = new QueryWrapper<>();
|
|
|
queryWrapper.eq("user_id", userId);
|
|
|
queryWrapper.eq("project_id", projectId);
|
|
|
- ProjectMember selectMember = (ProjectMember) projectMemberService.getOne(queryWrapper);
|
|
|
+ ProjectMember selectMember = projectMemberService.getOne(queryWrapper);
|
|
|
if (!Check.isNull(selectMember)) {
|
|
|
continue;
|
|
|
}
|
|
@@ -344,7 +347,7 @@ public class ProjectMemberController {
|
|
|
member.setRoleCode(roleCode);
|
|
|
}
|
|
|
member.setProjectId(projectId);
|
|
|
- member.setProjectName(projectName);
|
|
|
+ member.setProjectName(project.getProjectName());
|
|
|
member.setUserId(userId);
|
|
|
SysUser sysUser = sysUserService.getById(userId);
|
|
|
if (!Check.isNull(sysUser)) {
|