Commit 5b29732a authored by chenzhao's avatar chenzhao

修改消防人员

parent 6c374a25
...@@ -281,15 +281,18 @@ public class FirefightersController extends BaseController { ...@@ -281,15 +281,18 @@ public class FirefightersController extends BaseController {
QueryWrapper<FirefightersPost> queryWrapper1 = new QueryWrapper<>(); QueryWrapper<FirefightersPost> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.eq("firefighters_id", id); queryWrapper1.eq("firefighters_id", id);
FirefightersPost result = firefightersPostService.getOne(queryWrapper1); FirefightersPost result = firefightersPostService.getOne(queryWrapper1);
result = result == null ? new FirefightersPost() : result;
QueryWrapper<FirefightersEducation> queryWrapper2 = new QueryWrapper<>(); QueryWrapper<FirefightersEducation> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.eq("firefighters_id", id); queryWrapper2.eq("firefighters_id", id);
FirefightersEducation firefightersEducation = firefightersEducationService.getOne(queryWrapper2); FirefightersEducation firefightersEducation = firefightersEducationService.getOne(queryWrapper2);
firefightersEducation = firefightersEducation == null ? new FirefightersEducation() : firefightersEducation;
QueryWrapper<FirefightersWorkexperience> queryWrapper3 = new QueryWrapper<>(); QueryWrapper<FirefightersWorkexperience> queryWrapper3 = new QueryWrapper<>();
queryWrapper3.eq("firefighters_id", id); queryWrapper3.eq("firefighters_id", id);
FirefightersWorkexperience firefightersWorkexperience = firefightersWorkexperienceService.getOne(queryWrapper3); FirefightersWorkexperience firefightersWorkexperience = firefightersWorkexperienceService.getOne(queryWrapper3);
firefightersWorkexperience = firefightersWorkexperience == null ? new FirefightersWorkexperience() : firefightersWorkexperience;
FirefightersInfoDtos firefightersInfoDtos = new FirefightersInfoDtos(firefighters, firefightersContacts,result,firefightersEducation,firefightersWorkexperience); FirefightersInfoDtos firefightersInfoDtos = new FirefightersInfoDtos(firefighters, firefightersContacts,result,firefightersEducation,firefightersWorkexperience);
......
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