1、调整同步待办时,同步用户的逻辑
This commit is contained in:
@@ -599,9 +599,11 @@ public class LyricInternalServiceImpl implements ILyricInternalService {
|
||||
// 仿真负责人
|
||||
addDemandMember(todo.getVerifierNo(), MemberTypeEnum.PRINCIPAL.getCode(), demandUuid, jobNumber, curDateStr, memberList);
|
||||
// 仿真执行人
|
||||
addDemandMember(todo.getFollowBy(), MemberTypeEnum.EXECUTOR.getCode(), demandUuid, jobNumber, curDateStr, memberList);
|
||||
addDemandMember(todo.getEmulationExecutor(), MemberTypeEnum.EXECUTOR.getCode(), demandUuid, jobNumber, curDateStr, memberList);
|
||||
// 3D负责人
|
||||
addDemandMember(todo.getThreeDimensionalPerformer(), MemberTypeEnum.THREED.getCode(), demandUuid, jobNumber, curDateStr, memberList);
|
||||
// 关注人
|
||||
addDemandMember(todo.getFollowBy(), MemberTypeEnum.ATTENTION.getCode(), demandUuid, jobNumber, curDateStr, memberList);
|
||||
|
||||
return memberList;
|
||||
}
|
||||
@@ -621,10 +623,9 @@ public class LyricInternalServiceImpl implements ILyricInternalService {
|
||||
|
||||
|
||||
String[] userIdStr;
|
||||
if (MemberTypeEnum.PRINCIPAL.getCode().equals(type) || MemberTypeEnum.EXECUTOR.getCode().equals(type)) {
|
||||
if (MemberTypeEnum.PRINCIPAL.getCode().equals(type) || MemberTypeEnum.ATTENTION.getCode().equals(type)) {
|
||||
userIdStr = memberStr.split(",");
|
||||
}
|
||||
{
|
||||
}else {
|
||||
userIdStr = memberStr.split("-");
|
||||
}
|
||||
if (ObjectUtils.isEmpty(userIdStr)) {
|
||||
|
||||
@@ -3710,10 +3710,13 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
|
||||
// 仿真负责人
|
||||
addDemandMember(todoItem.getVerifierNo(), MemberTypeEnum.PRINCIPAL.getCode(), demandUuid, currentUserId, currentTimeStr, memberList,permissionReqList,usernameToUserIdMap);
|
||||
// 仿真执行人
|
||||
addDemandMember(todoItem.getFollowBy(), MemberTypeEnum.EXECUTOR.getCode(), demandUuid, currentUserId, currentTimeStr, memberList,permissionReqList,usernameToUserIdMap);
|
||||
addDemandMember(todoItem.getEmulationExecutor(), MemberTypeEnum.EXECUTOR.getCode(), demandUuid, currentUserId, currentTimeStr, memberList,permissionReqList,usernameToUserIdMap);
|
||||
// 3D负责人
|
||||
addDemandMember(todoItem.getThreeDimensionalPerformer(), MemberTypeEnum.THREED.getCode(), demandUuid, currentUserId, currentTimeStr, memberList,permissionReqList,usernameToUserIdMap);
|
||||
|
||||
// 关注人
|
||||
addDemandMember(todoItem.getFollowBy(), MemberTypeEnum.ATTENTION.getCode(), demandUuid, currentUserId, currentTimeStr, memberList,permissionReqList,usernameToUserIdMap);
|
||||
|
||||
// 需求创建人添加权限
|
||||
addUserPermission(permissionReqList, demandUuid, usernameToUserIdMap.get(todoItem.getIntroduceBy()),FilePermissionEnum.ALL.getValue());
|
||||
|
||||
|
||||
Reference in New Issue
Block a user