移动bug

dev
zhanglei 2026-08-04 09:59:42 +08:00
parent c4ade62474
commit 4d2a66776e
1 changed files with 8 additions and 9 deletions

View File

@ -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) { List<EvalProjectMemberDO> evalProjectMemberDOS = evalProjectMemberMapper.selectList(new LambdaQueryWrapper<EvalProjectMemberDO>()
.select(EvalProjectMemberDO::getRole)
.eq(EvalProjectMemberDO::getProjectId, projectId)
.eq(EvalProjectMemberDO::getPersonnelId, signerPersonnelId)
.last("limit 1"));
if (CollectionUtils.isEmpty(evalProjectMemberDOS)) {
fillMap.put("role", ""); fillMap.put("role", "");
} else { } else {
// 查询角色
List<EvalProjectMemberDO> evalProjectMemberDOS = evalProjectMemberMapper.selectList(new LambdaQueryWrapper<EvalProjectMemberDO>()
.select(EvalProjectMemberDO::getRole)
.eq(EvalProjectMemberDO::getProjectId, projectId)
.eq(EvalProjectMemberDO::getPersonnelId, signerPersonnelId)
.last("limit 1"));
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));