Commit 25ade279 authored by zhangsen's avatar zhangsen

bug

parent 7ed1d638
...@@ -483,7 +483,7 @@ public class ContingencyInstanceImpl implements IContingencyInstance { ...@@ -483,7 +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());
contingencyPlanInstance.setPersonImg(userInfo.getOrDefault("personImg", personImg)); contingencyPlanInstance.setPersonImg(ObjectUtils.isEmpty(userInfo) ? personImg : userInfo.getOrDefault("personImg", personImg));
return contingencyPlanInstance; return contingencyPlanInstance;
} }
......
...@@ -444,7 +444,7 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService { ...@@ -444,7 +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());
dto.setPersonImg(userInfo.getOrDefault("personImg", personImg)); dto.setPersonImg(ObjectUtils.isEmpty(userInfo) ? personImg : userInfo.getOrDefault("personImg", 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