修改党员报到提交表单异常；

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -1661,7 +1661,7 @@ public class AppUserServiceImpl implements AppUserService {
 
         EpdcPartyMemberRegistDTO partyMemberRegistDTO = new EpdcPartyMemberRegistDTO();
         CityCenterFromDTO formDTO = new CityCenterFromDTO();
-        if (dto.getDeptId() != null) {
+        if (dto.getDeptId() != null && dto.getAllDeptIds().length > 3) {
             formDTO.setDeptId(Long.parseLong(dto.getAllDeptIds()[dto.getAllDeptIds().length - 2]));
             SysDeptDTO liveDept = adminFeignClient.getDeptInfo(formDTO).getData();
             partyMemberRegistDTO.setLiveAddress(liveDept.getAddress());
@@ -1694,7 +1694,7 @@ public class AppUserServiceImpl implements AppUserService {
     public Result<EpdcPartyMemberRegistDTO> updateReportparty(ReportPartyDTO dto) {
         EpdcPartyMemberRegistDTO partyMemberRegistDTO = new EpdcPartyMemberRegistDTO();
         CityCenterFromDTO formDTO = new CityCenterFromDTO();
-        if(dto.getShiBei() == 1){
+        if (dto.getShiBei() == 1) {
             if (null != dto.getAllDeptIds() && dto.getAllDeptIds().length > 3) {
                 formDTO.setDeptId(Long.parseLong(dto.getAllDeptIds()[dto.getAllDeptIds().length - 2]));
                 SysDeptDTO liveDept = adminFeignClient.getDeptInfo(formDTO).getData();
@@ -1782,7 +1782,7 @@ public class AppUserServiceImpl implements AppUserService {
     }
 
     /**
-     * 分离原油代码的注册封装逻辑，避免代码污染
+     * 分离原有代码的注册封装逻辑，避免代码污染
      *
      * @param formDto
      * @return
@@ -1792,9 +1792,9 @@ public class AppUserServiceImpl implements AppUserService {
     private UserDTO generateNpmUserDTO(EpdcUserNpmRegisterFormDTO formDto) {
         EpdcUserRegistFormDTO registDTO = ConvertUtils.sourceToTarget(formDto, EpdcUserRegistFormDTO.class);
         //校验身份证号码是否注册
-        if (StringUtils.isEmpty(formDto.getUserId())) {
+//        if (StringUtils.isEmpty(formDto.getUserId())) {
-            npmVerifyUserRegisterData(registDTO);
+//            npmVerifyUserRegisterData(registDTO);
-        }
+//        }
         //密码加密
         if (StringUtils.isNotEmpty(formDto.getPassword())) {
             registDTO.setPassword(PasswordUtils.encode(formDto.getPassword()));
@@ -1832,8 +1832,8 @@ public class AppUserServiceImpl implements AppUserService {
             user.setMobileCity(phoneDto.getCityName());
             user.setMobileCarrier(phoneDto.getCarrier());
         }
-        user.setSex(IdentityNoUtils.getSex(registDTO.getIdentityNo()));
+//        user.setSex(IdentityNoUtils.getSex(registDTO.getIdentityNo()));
-        user.setBirthday(DateUtils.parse(IdentityNoUtils.getBirthday(registDTO.getIdentityNo()), DateUtils.DATE_PATTERN));
+//        user.setBirthday(DateUtils.parse(IdentityNoUtils.getBirthday(registDTO.getIdentityNo()), DateUtils.DATE_PATTERN));
 
         if (null != completeDept) {//设置组织
             user.setDistrict(completeDept.getDistrict());
@@ -1865,6 +1865,7 @@ public class AppUserServiceImpl implements AppUserService {
         user.setRegisterWay(AppUserRegisterWayEnum.WX.value());
         user.setRegisterSource(AppUserRegisterSourceEnum.WP.value());
         //设置注册表单数据
+
         user.setHobbies(formDto.getHobbies());//爱好
         user.setPartyFlag(String.valueOf(formDto.getPartyFlag()));//是否党员
         user.setShibei(formDto.getShibei());//是否在市北
@@ -1872,6 +1873,10 @@ public class AppUserServiceImpl implements AppUserService {
         user.setWorkType(formDto.getWorkType());//单位类型
         user.setWorkIndustry(formDto.getWorkIndustry());//行业
         user.setWorkIndustryText(formDto.getWorkIndustryText());
+        //非市北居住地址
+        if (StringUtils.isNotEmpty(formDto.getVillageName())) {
+            user.setVillageName(formDto.getVillageName());
+        }
         if (StringUtils.isNotEmpty(formDto.getFaceImg())) {//设置头像
             user.setFaceImg(formDto.getFaceImg());
         }