Merge remote-tracking branch 'origin/dev_1118' into dev_1118

esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/ParentAndAllDeptDTO.java

@@ -0,0 +1,43 @@
+package com.elink.esua.epdc.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 机构拼接信息
+ *
+ * @author yujintao
+ * @email yujintao@elink-cn.com
+ * @date 2019/9/7 9:8
+ */
+@Data
+public class ParentAndAllDeptDTO implements Serializable {
+
+    private static final long serialVersionUID = 8264059305193996215L;
+    /**
+     * 网格
+     */
+    private String grid;
+    /**
+     * 网格ID
+     */
+    private Long gridId;
+
+    /**
+     * 父所有部门ID
+     */
+    private String parentDeptIds;
+    /**
+     * 父所有部门
+     */
+    private String parentDeptNames;
+    /**
+     * 所有部门ID
+     */
+    private String allDeptIds;
+    /**
+     * 所有部门
+     */
+    private String allDeptNames;
+}

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java

@@ -16,6 +16,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.dto.CompleteDeptDTO;
+import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.SysDeptDTO;
 import com.elink.esua.epdc.dto.SysSimpleDeptDTO;
 import com.elink.esua.epdc.service.SysDeptService;
@@ -130,6 +131,18 @@ public class SysDeptController {
     public Result<CompleteDeptDTO> getCompleteDept(@PathVariable("gridId") String gridId) {
         return sysDeptService.getCompleteDept(gridId);
     }
+    /**
+     * 通过网格ID获取该网格所有上级机构
+     *
+     * @param deptId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.CompleteDeptDTO>
+     * @author yujintao
+     * @date 2019/9/7 09:12
+     */
+    @GetMapping("getParentAndAllDept/{deptId}")
+    public Result<ParentAndAllDeptDTO> getParentAndAllDept(@PathVariable("deptId") String deptId) {
+        return sysDeptService.getParentAndAllDept(deptId);
+    }
 
     /**
      * 通过街道ID获取项目可流转部门

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java

@@ -304,7 +304,7 @@ public class SysUserController {
      * @author work@yujt.net.cn
      * @date 2019/11/27 14:31
      */
-    @GetMapping("options/getByLoginUser")
+    @GetMapping("deptOptions/getByLoginUser")
     public Result<DeptOption> getUserDeptOption() {
         return sysDeptService.getUserDeptOption();
     }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java

@@ -9,13 +9,10 @@
 package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.CompleteDeptDTO;
-import com.elink.esua.epdc.dto.DeptOption;
-import com.elink.esua.epdc.dto.SysSimpleDeptDTO;
+import com.elink.esua.epdc.dto.*;
 import com.elink.esua.epdc.dto.epdc.GridForLeaderRegisterDTO;
 import com.elink.esua.epdc.entity.SysDeptEntity;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
-import com.elink.esua.epdc.dto.SysDeptDTO;
 
 import java.util.List;
 import java.util.Map;
@@ -75,6 +72,16 @@ public interface SysDeptService extends BaseService<SysDeptEntity> {
      */
     Result<CompleteDeptDTO> getCompleteDept(String gridId);
 
+    /**
+     * 通过网格ID获取该网格所有上级机构
+     *
+     * @param deptId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.CompleteDeptDTO>
+     * @author yujintao
+     * @date 2019/9/7 09:13
+     */
+    Result<ParentAndAllDeptDTO> getParentAndAllDept(String deptId);
+
     /**
      * 通过街道ID获取项目可流转部门
      *

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java

@@ -236,6 +236,37 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
         return new Result().ok(completeDept);
     }
 
+    @Override
+    public Result<ParentAndAllDeptDTO> getParentAndAllDept(String deptId) {
+        Long deptIdL = null;
+        try {
+            deptIdL = Long.parseLong(deptId.trim());
+        } catch (Exception e) {
+            log.error("->getCompleteDept:::部门ID格式转换异常:::deptId->{}", deptId);
+        }
+        if (null == deptId) {
+            return new Result().error("参数格式异常");
+        }
+        CompleteDeptDTO completeDept = this.baseDao.getCompleteDept(deptIdL);
+        ParentAndAllDeptDTO parentAndAllDeptDTO = new ParentAndAllDeptDTO();
+        parentAndAllDeptDTO.setGrid(completeDept.getGrid());
+        parentAndAllDeptDTO.setGridId(completeDept.getGridId());
+        // 父所有部门（包含街道、社区）
+        String deptNames = (StringUtils.isNotEmpty(completeDept.getStreet()) ? completeDept.getStreet() : "");
+        deptNames += (StringUtils.isNotEmpty(completeDept.getCommunity()) ? "-"+completeDept.getCommunity() : "");
+        String deptIds = (completeDept.getStreetId()!=null && completeDept.getStreetId()!= 0 ? completeDept.getStreetId().toString() : "");
+        deptIds += (completeDept.getCommunityId()!=null && completeDept.getCommunityId()!= 0 ? ","+completeDept.getCommunityId().toString() : "");
+        parentAndAllDeptDTO.setParentDeptIds(deptIds);
+        parentAndAllDeptDTO.setParentDeptNames(deptNames);
+        // 所有部门（包含街道、社区、网格）
+        deptNames += (StringUtils.isNotEmpty(completeDept.getGrid()) ? "-"+completeDept.getGrid() : "");
+        deptIds += (completeDept.getGridId()!=null && completeDept.getGridId()!= 0 ? ","+completeDept.getGridId().toString() : "");
+        parentAndAllDeptDTO.setAllDeptIds(deptIds);
+        parentAndAllDeptDTO.setAllDeptNames(deptNames);
+
+        return new Result().ok(parentAndAllDeptDTO);
+    }
+
     @Override
     public List<GridForLeaderRegisterDTO> selectListGridForLeader(List<String> gridIdList) {
         return this.baseDao.selectListGridForLeader(gridIdList);
@@ -423,7 +454,12 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
     @Override
     public Result<DeptOption> getUserDeptOption() {
         Long userId = SecurityUser.getUserId();
-        DeptOption option = (DeptOption) redisUtils.get(RedisKeys.getAdminUserDeptOptionKey(userId));
-        return new Result<DeptOption>().ok(option);
+        String deptOptionKey = RedisKeys.getAdminUserDeptOptionKey(userId);
+        Object obj = redisUtils.get(deptOptionKey);
+        if (null == obj) {
+            this.packageUserDeptOption(userId);
+            obj = redisUtils.get(deptOptionKey);
+        }
+        return new Result<DeptOption>().ok((DeptOption) obj);
     }
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml

@@ -114,16 +114,12 @@
 
     <select id="selectListHeadDeptNode" resultType="com.elink.esua.epdc.entity.SysDeptEntity">
         SELECT
-            d1.id,
-            d1.`name`
+            d1.id, d1.`name`
         FROM
             sys_dept d
             LEFT JOIN sys_dept d1 ON d.pids LIKE CONCAT( '%', d1.id, '%' )
         WHERE
-            d.id IN
-            <foreach collection="dataScopeDeptList" item="deptId" open="(" separator="," close=")" >
-                #{deptId}
-            </foreach>
+            d.id IN <foreach collection="dataScopeDeptList" item="deptId" open="(" separator="," close=")" > #{deptId} </foreach>
             AND d1.pid = 0
         GROUP BY d1.id
         ORDER BY d1.create_date ASC
@@ -135,8 +131,8 @@
             ( SELECT * FROM sys_dept d1 WHERE d1.id IN <foreach collection="dataScopeDeptList" item="item" open="(" separator="," close=")" > #{item} </foreach> ) tem1,
             ( SELECT *  FROM sys_dept d2 WHERE d2.pid IN <foreach collection="parentDeptIdList" item="deptId" open="(" separator="," close=")" > #{deptId} </foreach>) tem2
         WHERE
-            tem1.PIDS LIKE CONCAT( '%', tem2.id, '%' )
-            OR NOT EXISTS ( SELECT 1 FROM sys_dept d WHERE d.PID = tem2.ID )
+            ( tem1.PIDS LIKE CONCAT( '%', tem2.id, '%' ) OR tem1.PID = tem2.ID )
+            OR ( tem2.ID = tem1.ID AND NOT EXISTS ( SELECT 1 FROM sys_dept d WHERE d.PID = tem2.ID ) )
             AND tem2.ID != ''
         GROUP BY tem2.ID
         ORDER BY tem2.create_date ASC

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/UserDetailRedis.java

@@ -70,5 +70,6 @@ public class UserDetailRedis {
         //清空菜单导航、权限标识
         redisUtils.deleteByPattern(RedisKeys.getUserMenuNavKey(id));
         redisUtils.delete(RedisKeys.getUserPermissionsKey(id));
+        redisUtils.delete(RedisKeys.getAdminUserDeptOptionKey(id));
     }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.feign;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.CompleteDeptDTO;
+import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.SysUserDTO;
 import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO;
@@ -35,6 +36,17 @@ public interface AdminFeignClient {
     @GetMapping("sys/dept/getCompleteDept/{gridId}")
     Result<CompleteDeptDTO> getCompleteDept(@PathVariable("gridId") Long gridId);
 
+    /**
+     * 根据部门ID获取所有上级机构名称和ID拼接
+     *
+     * @param deptId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.CompleteDeptDTO>
+     * @author lipengfei
+     * @date 2019/11/27 09:31
+     */
+    @GetMapping("sys/dept/getParentAndAllDept/{deptId}")
+    Result<ParentAndAllDeptDTO> getParentAndAllDept(@PathVariable("deptId") Long deptId);
+
     /**
      * 网格长注册时，根据手机号，查询网格长管理的所有网格
      *

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java

@@ -4,6 +4,7 @@ import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.CompleteDeptDTO;
+import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.SysUserDTO;
 import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO;
@@ -25,6 +26,10 @@ public class AdminFeignClientFallback implements AdminFeignClient {
     public Result<CompleteDeptDTO> getCompleteDept(Long gridId) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getCompleteDept", gridId);
     }
+    @Override
+    public Result<ParentAndAllDeptDTO> getParentAndAllDept(Long deptId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getParentAndAllDept", deptId);
+    }
 
     @Override
     public Result<GridLeaderRegisterDTO> listGridWhileLeaderRegister(String mobile) {

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

@@ -4,6 +4,7 @@ import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.CompleteDeptDTO;
+import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.dto.group.GroupSettingStateDTO;
@@ -42,14 +43,24 @@ public class GroupServiceImpl implements GroupService {
             return new Result().error("获取用户信息失败");
         }
         // 获取该网格所有上级机构
-        Result<CompleteDeptDTO> deptDTOResult = adminFeignClient.getCompleteDept(userDetail.getGridId());
-        CompleteDeptDTO deptDTO = deptDTOResult.getData();
-        formDto.setArea(deptDTO.getDistrict());
-        formDto.setAreaId(deptDTO.getDistrictId());
-        formDto.setStreet(deptDTO.getStreet());
-        formDto.setStreetId(deptDTO.getStreetId());
-        formDto.setCommunity(deptDTO.getCommunity());
-        formDto.setCommunityId(deptDTO.getCommunityId());
+//        Result<CompleteDeptDTO> deptDTOResult = adminFeignClient.getCompleteDept(userDetail.getGridId());
+//        CompleteDeptDTO deptDTO = deptDTOResult.getData();
+//        formDto.setArea(deptDTO.getDistrict());
+//        formDto.setAreaId(deptDTO.getDistrictId());
+//        formDto.setStreet(deptDTO.getStreet());
+//        formDto.setStreetId(deptDTO.getStreetId());
+//        formDto.setCommunity(deptDTO.getCommunity());
+//        formDto.setCommunityId(deptDTO.getCommunityId());
+        //获取所有上级机构名称和ID拼接
+        Result<ParentAndAllDeptDTO> dtoResult = adminFeignClient.getParentAndAllDept(userDetail.getGridId());
+        ParentAndAllDeptDTO deptDTO = dtoResult.getData();
+        // 父所有部门
+        formDto.setParentDeptIds(deptDTO.getParentDeptIds());
+        formDto.setParentDeptNames(deptDTO.getParentDeptNames());
+        // 所有部门
+        formDto.setAllDeptIds(deptDTO.getAllDeptIds());
+        formDto.setAllDeptNames(deptDTO.getAllDeptNames());
+        // 网格
         formDto.setGrid(deptDTO.getGrid());
         formDto.setGridId(deptDTO.getGridId());
         formDto.setGroupCategory(NumConstant.ONE_STR);

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

@@ -4,6 +4,7 @@ import com.elink.esua.epdc.async.WxMaSecCheckTask;
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.CompleteDeptDTO;
+import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.UploadFormDTO;
 import com.elink.esua.epdc.dto.category.CategoryDTO;
 import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO;
@@ -61,26 +62,24 @@ public class IssueServiceImpl implements IssueService {
         // 上传内容安全检查
         wxMaSecCheckTask.checkMessage(formDto.getEventContent());
         // 获取该网格所有上级机构
-        Result<CompleteDeptDTO> deptDTOResult = adminFeignClient.getCompleteDept(userDetail.getGridId());
-        CompleteDeptDTO deptDTO = deptDTOResult.getData();
+//        Result<CompleteDeptDTO> deptDTOResult = adminFeignClient.getCompleteDept(userDetail.getGridId());
+//        CompleteDeptDTO deptDTO = deptDTOResult.getData();
 //        formDto.setArea(deptDTO.getDistrict());
 //        formDto.setAreaId(deptDTO.getDistrictId());
 //        formDto.setStreet(deptDTO.getStreet());
 //        formDto.setStreetId(deptDTO.getStreetId());
 //        formDto.setCommunity(deptDTO.getCommunity());
 //        formDto.setCommunityId(deptDTO.getCommunityId());
-        // 父所有部门（包含街道、社区）
-        String deptNames = (StringUtils.isNotEmpty(deptDTO.getStreet()) ? deptDTO.getStreet() : "");
-        deptNames += (StringUtils.isNotEmpty(deptDTO.getCommunity()) ? "-"+deptDTO.getCommunity() : "");
-        String deptIds = (deptDTO.getStreetId()!=null && deptDTO.getStreetId()!= 0 ? deptDTO.getStreetId().toString() : "");
-        deptIds += (deptDTO.getCommunityId()!=null && deptDTO.getCommunityId()!= 0 ? ","+deptDTO.getCommunityId().toString() : "");
-        formDto.setParentDeptIds(deptIds);
-        formDto.setParentDeptNames(deptNames);
-        // 所有部门（包含街道、社区、网格）
-        deptNames += (StringUtils.isNotEmpty(deptDTO.getGrid()) ? "-"+deptDTO.getGrid() : "");
-        deptIds += (deptDTO.getGridId()!=null && deptDTO.getGridId()!= 0 ? ","+deptDTO.getGridId().toString() : "");
-        formDto.setAllDeptIds(deptIds);
-        formDto.setAllDeptNames(deptNames);
+        // 获取所有上级机构名称和ID拼接
+        Result<ParentAndAllDeptDTO> dtoResult = adminFeignClient.getParentAndAllDept(userDetail.getGridId());
+        ParentAndAllDeptDTO deptDTO = dtoResult.getData();
+        // 父所有部门
+        formDto.setParentDeptIds(deptDTO.getParentDeptIds());
+        formDto.setParentDeptNames(deptDTO.getParentDeptNames());
+        // 所有部门
+        formDto.setAllDeptIds(deptDTO.getAllDeptIds());
+        formDto.setAllDeptNames(deptDTO.getAllDeptNames());
+        // 网格
         formDto.setGrid(deptDTO.getGrid());
         formDto.setGridId(deptDTO.getGridId());
         // 用户信息

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

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.service.impl;
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.CompleteDeptDTO;
+import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.UploadDTO;
 import com.elink.esua.epdc.dto.UploadToOssDTO;
 import com.elink.esua.epdc.dto.enums.TopicStateEnum;
@@ -48,14 +49,24 @@ public class TopicServiceImpl implements TopicService {
         }
 
         // 获取该网格所有上级机构
-        Result<CompleteDeptDTO> deptDTOResult = adminFeignClient.getCompleteDept(userDetail.getGridId());
-        CompleteDeptDTO deptDTO = deptDTOResult.getData();
-        formDto.setArea(deptDTO.getDistrict());
-        formDto.setAreaId(deptDTO.getDistrictId());
-        formDto.setStreet(deptDTO.getStreet());
-        formDto.setStreetId(deptDTO.getStreetId());
-        formDto.setCommunity(deptDTO.getCommunity());
-        formDto.setCommunityId(deptDTO.getCommunityId());
+//        Result<CompleteDeptDTO> deptDTOResult = adminFeignClient.getCompleteDept(userDetail.getGridId());
+//        CompleteDeptDTO deptDTO = deptDTOResult.getData();
+//        formDto.setArea(deptDTO.getDistrict());
+//        formDto.setAreaId(deptDTO.getDistrictId());
+//        formDto.setStreet(deptDTO.getStreet());
+//        formDto.setStreetId(deptDTO.getStreetId());
+//        formDto.setCommunity(deptDTO.getCommunity());
+//        formDto.setCommunityId(deptDTO.getCommunityId());
+        //获取所有上级机构名称和ID拼接
+        Result<ParentAndAllDeptDTO> dtoResult = adminFeignClient.getParentAndAllDept(userDetail.getGridId());
+        ParentAndAllDeptDTO deptDTO = dtoResult.getData();
+        // 父所有部门
+        formDto.setParentDeptIds(deptDTO.getParentDeptIds());
+        formDto.setParentDeptNames(deptDTO.getParentDeptNames());
+        // 所有部门
+        formDto.setAllDeptIds(deptDTO.getAllDeptIds());
+        formDto.setAllDeptNames(deptDTO.getAllDeptNames());
+        // 网格
         formDto.setGrid(deptDTO.getGrid());
         formDto.setGridId(deptDTO.getGridId());
 

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java

@@ -182,31 +182,36 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
         entity.setEventState(dto.getEventState());
 //        entity.setCategoryCode(dto.getCategoryId());
         //初始化分类
-        CategoryDTO cateDto =categoryService.get(Long.parseLong(dto.getCategoryId()));
-        entity.setCategoryCode(cateDto.getCategoryCode());
-        //获取所有父类分类标签
-        List<CategoryEntity> cateList = categoryService.getPidListById(Long.parseLong(dto.getCategoryId()));
-        //所选分类标签为多级
-        if(cateList != null && cateList.size() > 0) {
-            // list第一个为一级分类标签
-            entity.setFirstCategoryCode(cateList.get(0).getCategoryCode());
-            //分类标签全称拼接:-分割
-            String name = "";
-            for (int i = 0; i < cateList.size(); i++){
-                if (i == cateList.size() -1){
-                    name = name + cateList.get(i).getCategoryName();
-                }else {
-                    name = name + cateList.get(i).getCategoryName() + "-";
+        if(dto.getCategoryId() != null && "".equals(dto.getCategoryId())){
+            CategoryDTO cateDto =categoryService.get(Long.parseLong(dto.getCategoryId()));
+            entity.setCategoryCode(cateDto.getCategoryCode());
+            //获取所有父类分类标签
+            List<CategoryEntity> cateList = categoryService.getPidListById(Long.parseLong(dto.getCategoryId()));
+            //所选分类标签为多级
+            if(cateList != null && cateList.size() > 0) {
+                // list第一个为一级分类标签
+                entity.setFirstCategoryCode(cateList.get(0).getCategoryCode());
+                //分类标签全称拼接:-分割
+                String name = "";
+                for (int i = 0; i < cateList.size(); i++){
+                    if (i == cateList.size() -1){
+                        name = name + cateList.get(i).getCategoryName();
+                    }else {
+                        name = name + cateList.get(i).getCategoryName() + "-";
+                    }
                 }
+                name = name + "-" + cateDto.getCategoryName();
+                entity.setCategoryFullName(name);
+                // 所选分类标签为一级
+            } else {
+                //当前标签作为一级标签
+                entity.setFirstCategoryCode(cateDto.getCategoryCode());
+                entity.setCategoryFullName(cateDto.getCategoryName());
             }
-            name = name + "-" + cateDto.getCategoryName();
-            entity.setCategoryFullName(name);
-        // 所选分类标签为一级
         } else {
-            //当前标签作为一级标签
-            entity.setFirstCategoryCode(cateDto.getCategoryCode());
-            entity.setCategoryFullName(cateDto.getCategoryName());
+            return new Result().error("分类信息不能为空");
         }
+
         entity.setAdvice(dto.getAdvice());
         // 更新事件表审核状态
         updateById(entity);

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

@@ -39,42 +39,61 @@ public class GroupCreateFormDTO implements Serializable {
      * 社群类别 0：党员群，1：自建群
      */
     private String groupCategory;
+//    /**
+//     * 区
+//     */
+//    private String area;
+//    /**
+//     * 区ID
+//     */
+//    @NotNull(message = "用户区ID不能为空")
+//    private Long areaId;
+//    /**
+//     * 街道
+//     */
+//    private String street;
+//    /**
+//     * 街道ID
+//     */
+//    @NotNull(message = "用户街道ID不能为空")
+//    private Long streetId;
+//    /**
+//     * 社区
+//     */
+//    private String community;
+//    /**
+//     * 社区ID
+//     */
+//    @NotNull(message = "用户社区ID不能为空")
+//    private Long communityId;
     /**
-     * 区
-     */
-    private String area;
-    /**
-     * 区ID
-     */
-    @NotNull(message = "用户区ID不能为空")
-    private Long areaId;
-    /**
-     * 街道
+     * 网格
      */
-    private String street;
+    private String grid;
     /**
-     * 街道ID
+     * 网格ID
      */
-    @NotNull(message = "用户街道ID不能为空")
-    private Long streetId;
+    @NotNull(message = "用户网格ID不能为空")
+    private Long gridId;
+
     /**
-     * 社区
+     * 父所有部门ID
      */
-    private String community;
+    @NotNull(message = "父所有部门ID不能为空")
+    private String parentDeptIds;
     /**
-     * 社区ID
+     * 父所有部门
      */
-    @NotNull(message = "用户社区ID不能为空")
-    private Long communityId;
+    private String parentDeptNames;
     /**
-     * 网格
+     * 所有部门ID
      */
-    private String grid;
+    @NotNull(message = "所有部门ID不能为空")
+    private String allDeptIds;
     /**
-     * 网格ID
+     * 所有部门
      */
-    @NotNull(message = "用户网格ID不能为空")
-    private Long gridId;
+    private String allDeptNames;
 
     /**
      * 社群状态

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

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.dto.topic.form;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.util.List;
@@ -57,6 +58,24 @@ public class TopicSubmitFormDTO implements Serializable {
      */
     @NotBlank(message = "友邻社群ID不能为空")
     private String groupId;
+    /**
+     * 父所有部门ID
+     */
+    @NotNull(message = "父所有部门ID不能为空")
+    private String parentDeptIds;
+    /**
+     * 父所有部门
+     */
+    private String parentDeptNames;
+    /**
+     * 所有部门ID
+     */
+    @NotNull(message = "所有部门ID不能为空")
+    private String allDeptIds;
+    /**
+     * 所有部门
+     */
+    private String allDeptNames;
 
     /**
      * 用户ID