Commit 7337bef2 authored by 高建强's avatar 高建强

增加部门为空的时候的处理

parent d03170e7
...@@ -120,6 +120,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas ...@@ -120,6 +120,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
BeanUtils.copyProperties(personUser,personBasic); BeanUtils.copyProperties(personUser,personBasic);
if(departmentModel!=null){ if(departmentModel!=null){
personBasic.setProjectOrgCode(departmentModel.getOrgCode()); personBasic.setProjectOrgCode(departmentModel.getOrgCode());
personAccount.setProjectDepartmentName(departmentModel.getDepartmentName());
}else{ }else{
personBasic.setProjectOrgCode(companyModel.getOrgCode()); personBasic.setProjectOrgCode(companyModel.getOrgCode());
} }
...@@ -135,7 +136,6 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas ...@@ -135,7 +136,6 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
//人员账号信息 //人员账号信息
personAccount.setPersonId(personBasic.getSequenceNbr()); personAccount.setPersonId(personBasic.getSequenceNbr());
personAccount.setPuserId(agencyUserModel.getUserId()); personAccount.setPuserId(agencyUserModel.getUserId());
personAccount.setProjectDepartmentName(departmentModel.getDepartmentName());
personAccount.setProjectName(companyModel.getCompanyName()); personAccount.setProjectName(companyModel.getCompanyName());
personAccountService.save(personAccount); personAccountService.save(personAccount);
} }
...@@ -196,6 +196,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas ...@@ -196,6 +196,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
BeanUtils.copyProperties(personUser, personBasic); BeanUtils.copyProperties(personUser, personBasic);
if(departmentModel!=null){ if(departmentModel!=null){
personBasic.setProjectOrgCode(departmentModel.getOrgCode()); personBasic.setProjectOrgCode(departmentModel.getOrgCode());
personAccount.setProjectDepartmentName(departmentModel.getDepartmentName());
}else{ }else{
personBasic.setProjectOrgCode(companyModel.getOrgCode()); personBasic.setProjectOrgCode(companyModel.getOrgCode());
} }
...@@ -211,7 +212,6 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas ...@@ -211,7 +212,6 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
personCertificateService.updateById(personCertificate); personCertificateService.updateById(personCertificate);
//人员账号信息 //人员账号信息
personAccount.setPersonId(sequenceNbr); personAccount.setPersonId(sequenceNbr);
personAccount.setProjectDepartmentName(departmentModel.getDepartmentName());
personAccount.setProjectName(companyModel.getCompanyName()); personAccount.setProjectName(companyModel.getCompanyName());
personAccountService.updateById(personAccount); personAccountService.updateById(personAccount);
return model; return model;
......
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