Commit 6c90ecf5 authored by chenzhao's avatar chenzhao

修改bug

parent 0a6680f8
...@@ -77,10 +77,12 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi ...@@ -77,10 +77,12 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
firefighter.setNativePlaceValue(nativePlace.getResult().getRegionName()); firefighter.setNativePlaceValue(nativePlace.getResult().getRegionName());
} }
save(firefighter); save(firefighter);
if(firefighters.getFirefightersContacts() != null){
FirefightersContacts firefightersContact = firefighters.getFirefightersContacts(); FirefightersContacts firefightersContact = firefighters.getFirefightersContacts();
firefightersContact.setFirefightersId(firefighter.getSequenceNbr()); firefightersContact.setFirefightersId(firefighter.getSequenceNbr());
firefightersContactsService.save(firefightersContact); firefightersContactsService.save(firefightersContact);
firefighters.setFirefightersContacts(firefightersContact); firefighters.setFirefightersContacts(firefightersContact);
}
firefighters.setFirefighters(firefighter); firefighters.setFirefighters(firefighter);
} }
......
...@@ -106,7 +106,7 @@ public class FirefightersController extends BaseController { ...@@ -106,7 +106,7 @@ public class FirefightersController extends BaseController {
public ResponseModel<FirefightersInfoDto> saveFirefighters(@RequestBody FirefightersInfoDto firefighters) { public ResponseModel<FirefightersInfoDto> saveFirefighters(@RequestBody FirefightersInfoDto firefighters) {
try { try {
/*3184 消防人员,编辑页面岗位选择子分类保存成功后,概要中岗位未修改 chenzhao start 2021-10-19*/ /*3184 消防人员,编辑页面岗位选择子分类保存成功后,概要中岗位未修改 chenzhao start 2021-10-19*/
if (firefighters.getFirefighters().getJobTitleCode() != null){ if (firefighters.getFirefighters().getJobTitleCode() != null && !firefighters.getFirefighters().getJobTitleCode().equals("")){
DataDictionary gwmc = dataDictionaryService.getByCode(firefighters.getFirefighters().getJobTitleCode(), "GWMC"); DataDictionary gwmc = dataDictionaryService.getByCode(firefighters.getFirefighters().getJobTitleCode(), "GWMC");
firefighters.getFirefighters().setJobTitle(gwmc.getName()); firefighters.getFirefighters().setJobTitle(gwmc.getName());
} }
...@@ -114,7 +114,6 @@ public class FirefightersController extends BaseController { ...@@ -114,7 +114,6 @@ public class FirefightersController extends BaseController {
iFirefightersService.saveFirefighters(firefighters); iFirefightersService.saveFirefighters(firefighters);
return ResponseHelper.buildResponse(firefighters); return ResponseHelper.buildResponse(firefighters);
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException("系统异常"); throw new RuntimeException("系统异常");
} }
......
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