Merge branch 'dev_1118' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_1118

esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/form/GroupCreateFormDTO.java

@@ -39,15 +39,15 @@ public class GroupCreateFormDTO implements Serializable {
      * 社群类别 0：党员群，1：自建群
      */
     private String groupCategory;
-//    /**
-//     * 区
-//     */
-//    private String area;
-//    /**
-//     * 区ID
-//     */
-//    @NotNull(message = "用户区ID不能为空")
-//    private Long areaId;
+    /**
+     * 区
+     */
+    private String area;
+    /**
+     * 区ID
+     */
+    @NotNull(message = "用户区ID不能为空")
+    private Long areaId;
 //    /**
 //     * 街道
 //     */

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserGridRelationDTO.java

@@ -19,6 +19,7 @@ package com.elink.esua.epdc.dto;
 
 import java.io.Serializable;
 import java.util.Date;
+
 import lombok.Data;
 
 
@@ -123,4 +124,24 @@ public class UserGridRelationDTO implements Serializable {
      */
     private String leaderFlag;
 
+    /***
+     *所有部门名称
+     */
+    private String allDeptNames;
+
+    /***
+     *所有部门ID
+     */
+    private String allDeptIds;
+
+    /***
+     *父所有部门
+     */
+    private String parentDeptNames;
+
+    /***
+     *父所有部门
+     */
+    private String parentDeptIds;
+
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -399,9 +399,13 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             }
         }
         userGridRel.setUserId(formUserDto.getId());
+        //修改数据库结构
+        userGridRel.setAllDeptNames(formUserDto.getStreet()+"-"+formUserDto.getCommunity()+"-"+formUserDto.getGrid());
+        userGridRel.setAllDeptIds(formUserDto.getStreetId()+","+formUserDto.getCommunityId()+","+formUserDto.getGridId());
+        userGridRel.setParentDeptNames(formUserDto.getStreet()+"-"+formUserDto.getCommunity());
+        userGridRel.setParentDeptIds(formUserDto.getStreetId()+","+formUserDto.getCommunityId());
         // 用户绑定网格
         userGridRelationService.save(userGridRel);
-
         // 组装用户注册信息
         EpdcUserRegisterInfoResultDTO resultDto = new EpdcUserRegisterInfoResultDTO();
         resultDto.setRegisterState(NumConstant.TWO);