|
|
|
@ -121,7 +121,12 @@ public class FmProjectMilestoneServiceImpl extends BaseServiceImpl<FmProjectMile |
|
|
|
if (!entity.getNextApproverId().equals(AuthUtil.getUserId())) { |
|
|
|
if (!entity.getNextApproverId().equals(AuthUtil.getUserId())) { |
|
|
|
throw new ServiceException("您不是当前里程碑的核查人"); |
|
|
|
throw new ServiceException("您不是当前里程碑的核查人"); |
|
|
|
} |
|
|
|
} |
|
|
|
fmProjectMilestone.setCheckMan(entity.getNextApproverId().toString()); |
|
|
|
R<User> userR1 = userClient.userInfoById(entity.getNextApproverId()); |
|
|
|
|
|
|
|
if (!userR1.isSuccess() || BeanUtil.isEmpty(userR1.getData())) { |
|
|
|
|
|
|
|
throw new RuntimeException("当前里程碑的核查人不存在"); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
fmProjectMilestone.setCheckMan(userR1.getData().getRealName()); |
|
|
|
|
|
|
|
fmProjectMilestone.setCheckManId(entity.getNextApproverId().toString()); |
|
|
|
|
|
|
|
|
|
|
|
// 如果核查通过,需要流转到核准节点
|
|
|
|
// 如果核查通过,需要流转到核准节点
|
|
|
|
if (FmProjectMilestoneEntity.CHECK_RESULT_OK.equals(fmProjectMilestone.getCheckResult())) { |
|
|
|
if (FmProjectMilestoneEntity.CHECK_RESULT_OK.equals(fmProjectMilestone.getCheckResult())) { |
|
|
|
|