Commit 7f2d8d50 authored by 鲁鸿波's avatar 鲁鸿波

获取危险作业详情时如果为null则返回空字符串

parent 15b3e246
......@@ -72,6 +72,17 @@ public class THazardAssessmentServiceImpl extends SuperServiceImpl<THazardAssess
//作业地点
tHazardAssessmentDTO.setWorkLocation(tHazardWorkPlan.getWorkLocation());
List<THazardAssessmentDetails> assessmentId = tHazardAssessmentDetailsService.list(new QueryWrapper<THazardAssessmentDetails>().eq("assessment_id", tHazardAssessment.getId()));
for(THazardAssessmentDetails tHazardAssessmentDetails : assessmentId){
if(StringUtils.isEmpty(tHazardAssessmentDetails.getConsequence())){
tHazardAssessmentDetails.setConsequence("");
}
if(StringUtils.isEmpty(tHazardAssessmentDetails.getControlMeasures())){
tHazardAssessmentDetails.setControlMeasures("");
}
if(StringUtils.isEmpty(tHazardAssessmentDetails.getMajorRisk())){
tHazardAssessmentDetails.setMajorRisk("");
}
}
tHazardAssessmentDTO.setTHazardAssessmentDetails(assessmentId);
return tHazardAssessmentDTO;
}
......
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