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,13 +19,14 @@ package com.elink.esua.epdc.dto;
 
 import java.io.Serializable;
 import java.util.Date;
+
 import lombok.Data;
 
 
 /**
  * 网格长与网格关系表
  *
- * @author work@yujt.net.cn 
+ * @author work@yujt.net.cn
  * @since v1.0.0 2019-10-23
  */
 @Data
@@ -36,12 +37,12 @@ public class UserGridRelationDTO implements Serializable {
     /**
      * 主键
      */
-	private String id;
+    private String id;
 
     /**
      * 用户ID
      */
-	private String userId;
+    private String userId;
 
     /**
      * 区县
@@ -76,51 +77,71 @@ public class UserGridRelationDTO implements Serializable {
     /**
      * 所属网格
      */
-	private String grid;
+    private String grid;
 
     /**
      * 网格ID
      */
-	private Long gridId;
+    private Long gridId;
 
     /**
      * 最后切换此网格的时间
      */
-	private Date switchedTime;
+    private Date switchedTime;
 
     /**
      * 乐观锁
      */
-	private Integer revision;
+    private Integer revision;
 
     /**
      * 创建人
      */
-	private String createdBy;
+    private String createdBy;
 
     /**
      * 创建时间
      */
-	private Date createdTime;
+    private Date createdTime;
 
     /**
      * 更新人
      */
-	private String updatedBy;
+    private String updatedBy;
 
     /**
      * 更新时间
      */
-	private Date updatedTime;
+    private Date updatedTime;
 
     /**
      * 删除标记
      */
-	private String delFlag;
+    private String delFlag;
 
     /**
      * 是否是网格长 0否1是
      */
     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);