Commit 1c35497f authored by tangwei's avatar tangwei

修改bug

parent ebf93677
...@@ -197,7 +197,6 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas ...@@ -197,7 +197,6 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
CompanyModel companyModel=new CompanyModel(); CompanyModel companyModel=new CompanyModel();
//单位 //单位
companyModel=this.getCompanyModel(personAccount.getProjectId()); companyModel=this.getCompanyModel(personAccount.getProjectId());
//人员基础信息 //人员基础信息
PersonBasic personBasic = new PersonBasic(); PersonBasic personBasic = new PersonBasic();
personBasic.setSequenceNbr(sequenceNbr); personBasic.setSequenceNbr(sequenceNbr);
...@@ -208,23 +207,17 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas ...@@ -208,23 +207,17 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
}else{ }else{
personBasic.setProjectOrgCode(companyModel.getOrgCode()); personBasic.setProjectOrgCode(companyModel.getOrgCode());
} }
if(!personUser.getNativePlace().isEmpty()){ if(personUser.getNativePlace()!=null){
personBasic.setNativePlace(JSON.toJSONString(personUser.getNativePlace())); personBasic.setNativePlace(JSON.toJSONString(personUser.getNativePlace()));
} }
this.personBasicMapper.updateById(personBasic); this.personBasicMapper.updateById(personBasic);
//人员归属信息 //人员归属信息
PersonSkillEducation personSkillEducation = new PersonSkillEducation(); PersonSkillEducation personSkillEducation = new PersonSkillEducation();
BeanUtils.copyProperties(personUser, personSkillEducation); BeanUtils.copyProperties(personUser, personSkillEducation);
personSkillEducation.setPersonId(personBasic.getSequenceNbr()); personSkillEducation.setPersonId(personBasic.getSequenceNbr());
PersonSkillEducation personSkillEducationd= personSkillEducationService.getOne(new QueryWrapper<PersonSkillEducation>().eq("person_id", personBasic.getSequenceNbr())); PersonSkillEducation personSkillEducationd= personSkillEducationService.getOne(new QueryWrapper<PersonSkillEducation>().eq("person_id", personBasic.getSequenceNbr()));
personSkillEducation.setSequenceNbr(personSkillEducationd.getSequenceNbr()); personSkillEducation.setSequenceNbr(personSkillEducationd.getSequenceNbr());
personSkillEducationService.updateById(personSkillEducation); personSkillEducationService.updateById(personSkillEducation);
//人员资质信息 //人员资质信息
personCertificateService.updateById(personCertificate); personCertificateService.updateById(personCertificate);
//人员账号信息 //人员账号信息
...@@ -243,11 +236,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas ...@@ -243,11 +236,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
wrapper1.eq("is_delete", 0); wrapper1.eq("is_delete", 0);
//人员基础信息 //人员基础信息
PersonBasic personBasic = this.getOne(wrapper1); PersonBasic personBasic = this.getOne(wrapper1);
BeanUtils.copyProperties(personBasic,personUser); BeanUtils.copyProperties(personBasic,personUser);
//人员技能学历信息 //人员技能学历信息
QueryWrapper<PersonSkillEducation> wrapper2 = new QueryWrapper(); QueryWrapper<PersonSkillEducation> wrapper2 = new QueryWrapper();
wrapper2.eq("person_id", sequenceNbr); wrapper2.eq("person_id", sequenceNbr);
......
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