Skip to content

Y
YeeAmosFireAutoSysRoot
Commit 7ed1d638 authored by zhangsen's avatar zhangsen
Browse files
Options

bug xiugai

parent 5afed1dd
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 16 deletions
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyInstanceImpl.java
View file @ 7ed1d638
...@@ -483,16 +483,7 @@ public class ContingencyInstanceImpl implements IContingencyInstance { ...@@ -483,16 +483,7 @@ 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());
if (userInfo != null) { contingencyPlanInstance.setPersonImg(userInfo.getOrDefault("personImg", personImg));
String img = userInfo.get("personImg");
if (StringUtils.isNotBlank(img)) {
contingencyPlanInstance.setPersonImg(img);
} else {
contingencyPlanInstance.setPersonImg(personImg);
}
} else {
contingencyPlanInstance.setPersonImg(personImg);
}
return contingencyPlanInstance; return contingencyPlanInstance;
} }
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/PlanVisual3dServiceImpl.java
View file @ 7ed1d638
...@@ -444,12 +444,7 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService { ...@@ -444,12 +444,7 @@ 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());
String img = userInfo.get("personImg"); dto.setPersonImg(userInfo.getOrDefault("personImg", personImg));
if (StringUtils.isNotBlank(img)) {
dto.setPersonImg(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