diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/SafetyMessageGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/SafetyMessageGatewayImpl.java index 3ec6e16..6252e1b 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/SafetyMessageGatewayImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/SafetyMessageGatewayImpl.java @@ -18,6 +18,7 @@ import org.qinan.safetyeval.infrastructure.mapper.EvalProjectMemberMapper; import org.qinan.safetyeval.infrastructure.mapper.SafetyMessageMapper; import org.qinan.safetyeval.infrastructure.support.InsertFieldDefaults; import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import javax.annotation.Resource; @@ -58,19 +59,17 @@ public class SafetyMessageGatewayImpl implements SafetyMessageGateway { } fillMap.put("fileName", projectStageEnum.getMsg()); fillMap.put("version", MsgConstant.SIGN_TASK_DEFAULT_VERSION); - - if (projectStageEnum == ProjectStageEnum.RISK_ANALYSIS) { + // 查询角色 + List evalProjectMemberDOS = evalProjectMemberMapper.selectList(new LambdaQueryWrapper() + .select(EvalProjectMemberDO::getRole) + .eq(EvalProjectMemberDO::getProjectId, projectId) + .eq(EvalProjectMemberDO::getPersonnelId, signerPersonnelId) + .last("limit 1")); + if (CollectionUtils.isEmpty(evalProjectMemberDOS)) { fillMap.put("role", ""); } else { - // 查询角色 - List evalProjectMemberDOS = evalProjectMemberMapper.selectList(new LambdaQueryWrapper() - .select(EvalProjectMemberDO::getRole) - .eq(EvalProjectMemberDO::getProjectId, projectId) - .eq(EvalProjectMemberDO::getPersonnelId, signerPersonnelId) - .last("limit 1")); fillMap.put("role", ProjectRoleEnum.fromVals(evalProjectMemberDOS.get(0).getRole())); } - params.put(MsgConstant.MSG_CONTENT_KEY_CONTENT, NoticeTypeEnum.SIGN_TASK_NOTICE.fillTemplate(fillMap)); safetyMessageEntity.setSendContent(JSON.toJSONString(params)); safetyMessageEntity.setReceiveId(Long.valueOf(signerPersonnelId));