|
@@ -266,25 +266,25 @@ public class UserAllocationController {
|
|
result.error500("未找到对应实体");
|
|
result.error500("未找到对应实体");
|
|
} else {
|
|
} else {
|
|
boolean ok = userAllocationService.updateById(userAllocation);
|
|
boolean ok = userAllocationService.updateById(userAllocation);
|
|
|
|
+ UserAllocation update = userAllocationService.getById(userAllocation.getId());
|
|
QueryWrapper<ProjectMember> memberQueryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<ProjectMember> memberQueryWrapper = new QueryWrapper<>();
|
|
- memberQueryWrapper.eq("user_id", userAllocation.getUserId());
|
|
|
|
- memberQueryWrapper.eq("project_id", userAllocation.getProjectId());
|
|
|
|
|
|
+ memberQueryWrapper.eq("user_id", update.getUserId());
|
|
|
|
+ memberQueryWrapper.eq("project_id", update.getProjectId());
|
|
memberQueryWrapper.last("limit 1");
|
|
memberQueryWrapper.last("limit 1");
|
|
ProjectMember member = memberMapper.selectOne(memberQueryWrapper);
|
|
ProjectMember member = memberMapper.selectOne(memberQueryWrapper);
|
|
if (Check.isNull(member)) {
|
|
if (Check.isNull(member)) {
|
|
ProjectMember addMember = new ProjectMember();
|
|
ProjectMember addMember = new ProjectMember();
|
|
- addMember.setProjectId(userAllocation.getProjectId());
|
|
|
|
- addMember.setProjectName(userAllocation.getProjectName());
|
|
|
|
- addMember.setUserId(userAllocation.getUserId());
|
|
|
|
- addMember.setUserName(userAllocation.getUserName());
|
|
|
|
- String roleCode = sysRoleService.getRoleCodeByUserId(userAllocation.getUserId());
|
|
|
|
|
|
+ addMember.setProjectId(update.getProjectId());
|
|
|
|
+ addMember.setProjectName(update.getProjectName());
|
|
|
|
+ addMember.setUserId(update.getUserId());
|
|
|
|
+ addMember.setUserName(update.getUserName());
|
|
|
|
+ String roleCode = sysRoleService.getRoleCodeByUserId(update.getUserId());
|
|
if (!Check.isNull(roleCode)) {
|
|
if (!Check.isNull(roleCode)) {
|
|
addMember.setRoleCode(roleCode);
|
|
addMember.setRoleCode(roleCode);
|
|
}
|
|
}
|
|
projectMemberService.save(addMember);
|
|
projectMemberService.save(addMember);
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
if (ok) {
|
|
if (ok) {
|
|
result.success("修改成功!");
|
|
result.success("修改成功!");
|
|
}
|
|
}
|