移动bug
parent
c4ade62474
commit
4d2a66776e
|
|
@ -18,6 +18,7 @@ import org.qinan.safetyeval.infrastructure.mapper.EvalProjectMemberMapper;
|
||||||
import org.qinan.safetyeval.infrastructure.mapper.SafetyMessageMapper;
|
import org.qinan.safetyeval.infrastructure.mapper.SafetyMessageMapper;
|
||||||
import org.qinan.safetyeval.infrastructure.support.InsertFieldDefaults;
|
import org.qinan.safetyeval.infrastructure.support.InsertFieldDefaults;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
import org.springframework.util.CollectionUtils;
|
||||||
import org.springframework.util.StringUtils;
|
import org.springframework.util.StringUtils;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
|
|
@ -58,19 +59,17 @@ public class SafetyMessageGatewayImpl implements SafetyMessageGateway {
|
||||||
}
|
}
|
||||||
fillMap.put("fileName", projectStageEnum.getMsg());
|
fillMap.put("fileName", projectStageEnum.getMsg());
|
||||||
fillMap.put("version", MsgConstant.SIGN_TASK_DEFAULT_VERSION);
|
fillMap.put("version", MsgConstant.SIGN_TASK_DEFAULT_VERSION);
|
||||||
|
|
||||||
if (projectStageEnum == ProjectStageEnum.RISK_ANALYSIS) {
|
|
||||||
fillMap.put("role", "");
|
|
||||||
} else {
|
|
||||||
// 查询角色
|
// 查询角色
|
||||||
List<EvalProjectMemberDO> evalProjectMemberDOS = evalProjectMemberMapper.selectList(new LambdaQueryWrapper<EvalProjectMemberDO>()
|
List<EvalProjectMemberDO> evalProjectMemberDOS = evalProjectMemberMapper.selectList(new LambdaQueryWrapper<EvalProjectMemberDO>()
|
||||||
.select(EvalProjectMemberDO::getRole)
|
.select(EvalProjectMemberDO::getRole)
|
||||||
.eq(EvalProjectMemberDO::getProjectId, projectId)
|
.eq(EvalProjectMemberDO::getProjectId, projectId)
|
||||||
.eq(EvalProjectMemberDO::getPersonnelId, signerPersonnelId)
|
.eq(EvalProjectMemberDO::getPersonnelId, signerPersonnelId)
|
||||||
.last("limit 1"));
|
.last("limit 1"));
|
||||||
|
if (CollectionUtils.isEmpty(evalProjectMemberDOS)) {
|
||||||
|
fillMap.put("role", "");
|
||||||
|
} else {
|
||||||
fillMap.put("role", ProjectRoleEnum.fromVals(evalProjectMemberDOS.get(0).getRole()));
|
fillMap.put("role", ProjectRoleEnum.fromVals(evalProjectMemberDOS.get(0).getRole()));
|
||||||
}
|
}
|
||||||
|
|
||||||
params.put(MsgConstant.MSG_CONTENT_KEY_CONTENT, NoticeTypeEnum.SIGN_TASK_NOTICE.fillTemplate(fillMap));
|
params.put(MsgConstant.MSG_CONTENT_KEY_CONTENT, NoticeTypeEnum.SIGN_TASK_NOTICE.fillTemplate(fillMap));
|
||||||
safetyMessageEntity.setSendContent(JSON.toJSONString(params));
|
safetyMessageEntity.setSendContent(JSON.toJSONString(params));
|
||||||
safetyMessageEntity.setReceiveId(Long.valueOf(signerPersonnelId));
|
safetyMessageEntity.setReceiveId(Long.valueOf(signerPersonnelId));
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue