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

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

@@ -1661,8 +1661,13 @@ public class AppUserServiceImpl implements AppUserService {
 
         EpdcPartyMemberRegistDTO partyMemberRegistDTO = new EpdcPartyMemberRegistDTO();
         CityCenterFromDTO formDTO = new CityCenterFromDTO();
-        if (dto.getDeptId() != null && dto.getAllDeptIds().length > 3) {
+        if (dto.getDeptId() != null && dto.getAllDeptIds().length > 2) {
+            if (dto.getAllDeptIds().length == 3) {
+                formDTO.setDeptId(Long.parseLong(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]));
+            }
+            if (dto.getAllDeptIds().length == 4) {
                 formDTO.setDeptId(Long.parseLong(dto.getAllDeptIds()[dto.getAllDeptIds().length - 2]));
+            }
             SysDeptDTO liveDept = adminFeignClient.getDeptInfo(formDTO).getData();
             partyMemberRegistDTO.setLiveAddress(liveDept.getAddress());
             partyMemberRegistDTO.setLiveCommunity(liveDept.getName());
@@ -1695,8 +1700,13 @@ public class AppUserServiceImpl implements AppUserService {
         EpdcPartyMemberRegistDTO partyMemberRegistDTO = new EpdcPartyMemberRegistDTO();
         CityCenterFromDTO formDTO = new CityCenterFromDTO();
         if (dto.getShiBei() == 1) {
-            if (null != dto.getAllDeptIds() && dto.getAllDeptIds().length > 3) {
+            if (null != dto.getAllDeptIds() && dto.getAllDeptIds().length > 2) {
+                if (dto.getAllDeptIds().length == 3) {
+                    formDTO.setDeptId(Long.parseLong(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]));
+                }
+                if (dto.getAllDeptIds().length == 4) {
                     formDTO.setDeptId(Long.parseLong(dto.getAllDeptIds()[dto.getAllDeptIds().length - 2]));
+                }
                 SysDeptDTO liveDept = adminFeignClient.getDeptInfo(formDTO).getData();
                 partyMemberRegistDTO.setLiveAddress(liveDept.getAddress());
                 partyMemberRegistDTO.setLiveCommunity(liveDept.getName());
@@ -1801,16 +1811,13 @@ public class AppUserServiceImpl implements AppUserService {
         }
         //微信绑定
         WxMaJscode2SessionResult nmpWxUser = this.getNMPWxUser(formDto.getWxCode());
-        Long deptId = 0L;
         CompleteDeptDTO completeDept = null;
         //如果在市北，获取网格机构详情
         if (formDto.getShibei() == 1) {
-            if (null != formDto.getAllDeptIds()) {
+            if (null != formDto.getAllDeptIds() && formDto.getAllDeptIds().length == 4) {
-                if (formDto.getAllDeptIds().length > 3) {
+                Long gridId = Long.parseLong(formDto.getAllDeptIds()[formDto.getAllDeptIds().length - 1]);
-                    //默认获取社区第一网格
+                registDTO.setGridId(gridId);
-                    registDTO.setGridId(Long.parseLong(formDto.getAllDeptIds()[formDto.getAllDeptIds().length - 2]));
+                completeDept = adminFeignClient.getCompleteDept(gridId).getData();
-                }
-                completeDept = adminFeignClient.getCompleteDept(Long.parseLong(formDto.getAllDeptIds()[formDto.getAllDeptIds().length - 1])).getData();
                 if (null == completeDept) {
                     throw new RenException("查询网格信息失败");
                 }
@@ -1865,7 +1872,7 @@ public class AppUserServiceImpl implements AppUserService {
         user.setRegisterWay(AppUserRegisterWayEnum.WX.value());
         user.setRegisterSource(AppUserRegisterSourceEnum.WP.value());
         //设置注册表单数据
-
+        user.setAllDeptIds(StringUtils.join(formDto.getAllDeptIds(), ","));
         user.setHobbies(formDto.getHobbies());//爱好
         user.setPartyFlag(String.valueOf(formDto.getPartyFlag()));//是否党员
         user.setShibei(formDto.getShibei());//是否在市北