Commit fb57b907 authored by 高建强's avatar 高建强

item:应急处置修改人员默认头像

parent c0ed1a43
...@@ -518,7 +518,12 @@ public class ContingencyInstanceImpl implements IContingencyInstance { ...@@ -518,7 +518,12 @@ public class ContingencyInstanceImpl implements IContingencyInstance {
contingencyPlanInstance.setStartUserId(user.getUserId()); contingencyPlanInstance.setStartUserId(user.getUserId());
contingencyPlanInstance.setStartUserName(user.getRealName()); contingencyPlanInstance.setStartUserName(user.getRealName());
Map<String, String> userInfo = contingencyPlanInstanceMapper.getUserByUserId(user.getUserId()); Map<String, String> userInfo = contingencyPlanInstanceMapper.getUserByUserId(user.getUserId());
contingencyPlanInstance.setPersonImg(ObjectUtils.isEmpty(userInfo) ? personImg : userInfo.getOrDefault("personImg", personImg)); if (!ObjectUtils.isEmpty(userInfo)) {
String img = userInfo.get("personImg");
contingencyPlanInstance.setPersonImg(StringUtils.isBlank(img) ? personImg : img);
} else {
contingencyPlanInstance.setPersonImg(personImg);
}
} }
return contingencyPlanInstance; return contingencyPlanInstance;
} }
......
...@@ -497,7 +497,12 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService { ...@@ -497,7 +497,12 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
dto.setRecordType("REPLYMESSAGE"); dto.setRecordType("REPLYMESSAGE");
dto.setCreateDate(new Date()); dto.setCreateDate(new Date());
Map<String, String> userInfo = contingencyPlanInstanceMapper.getUserByUserId(user.getUserId()); Map<String, String> userInfo = contingencyPlanInstanceMapper.getUserByUserId(user.getUserId());
dto.setPersonImg(ObjectUtils.isEmpty(userInfo) ? personImg : userInfo.getOrDefault("personImg", personImg)); if (!ObjectUtils.isEmpty(userInfo)) {
String img = userInfo.get("personImg");
dto.setPersonImg(StringUtils.isBlank(img) ? personImg : img);
} else {
dto.setPersonImg(personImg);
}
dto.setContent(StringUtil.isNotEmpty(dto.getContent()) ? dto.getContent() : ""); dto.setContent(StringUtil.isNotEmpty(dto.getContent()) ? dto.getContent() : "");
repository.save(dto); repository.save(dto);
String topic = String.format("/%s/%s/%s", serviceName, stationName, "plan"); String topic = String.format("/%s/%s/%s", serviceName, stationName, "plan");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment