From db8007f192f802d9d4250a84d15e63aea7faa87c Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Fri, 31 Jul 2020 13:45:27 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=86=85=E5=AE=B9=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E3=80=91-=E3=80=90=E6=96=B0=E5=A2=9E=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E3=80=91-=EF=BC=88=E7=8E=8B=E7=AB=A5?=
 =?UTF-8?q?=EF=BC=89-2020/07/31?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EventCommentServiceImpl.java | 14 ++++++--
 .../service/impl/EpdcEventsServiceImpl.java   |  9 +++--
 .../epdc/modules/feign/AdminFeignClient.java  | 13 +++++++
 .../fallback/AdminFeignClientFallback.java    |  6 ++++
 .../item/service/impl/ItemServiceImpl.java    | 13 ++++---
 .../service/impl/TopicCommentServiceImpl.java | 14 ++++++--
 .../modules/feign/AdminFeignClient.java       | 30 ++++++++++++++++
 .../fallback/AdminFeignClientFallback.java    | 26 ++++++++++++++
 .../topic/service/impl/TopicServiceImpl.java  | 17 ++++++---
 .../service/impl/ActInfoServiceImpl.java      | 16 ++++++---
 .../impl/ActUserClockLogServiceImpl.java      | 13 +++++--
 .../epdc/modules/feign/AdminFeignClient.java  | 35 +++++++++++++++++++
 .../fallback/AdminFeignClientFallback.java    | 26 ++++++++++++++
 13 files changed, 205 insertions(+), 27 deletions(-)
 create mode 100644 esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/AdminFeignClient.java
 create mode 100644 esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/fallback/AdminFeignClientFallback.java
 create mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java
 create mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java
index 0e9a869f3..bac96503e 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java
@@ -25,9 +25,11 @@ import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.security.content.CheckDataUtils;
 import com.elink.esua.epdc.commons.tools.security.content.ModuleName;
+import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsDTO;
 import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultDTO;
 import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultMessageDTO;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.constant.EventsNoticeConstant;
@@ -49,6 +51,7 @@ import com.elink.esua.epdc.modules.comment.entity.EventCommentEntity;
 import com.elink.esua.epdc.modules.comment.service.EventCommentService;
 import com.elink.esua.epdc.modules.comment.service.EventCommentUserAttitudeService;
 import com.elink.esua.epdc.modules.events.service.EpdcEventsService;
+import com.elink.esua.epdc.modules.feign.AdminFeignClient;
 import com.elink.esua.epdc.modules.feign.ContentSecurityFeignClient;
 import com.elink.esua.epdc.modules.feign.UserFeignClient;
 import com.elink.esua.epdc.modules.issue.entity.IssueEntity;
@@ -100,6 +103,9 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev
     @Autowired
     private UserFeignClient userInfoFeignClient;
 
+    @Autowired
+    private AdminFeignClient adminFeignClient;
+
     @Override
     public PageData<EventCommentDTO> page(Map<String, Object> params) {
         IPage<EventCommentEntity> page = baseDao.selectPage(
@@ -163,13 +169,15 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev
         if(null != user.getData()){
             mobile = user.getData().getMobile();
         }
+        // 获取所有上级机构名称和ID拼接
+        ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(SecurityUser.getDeptId()).getData();
         CheckResultDTO contentResult = CheckDataUtils.checkContent(textList);
         if (contentResult != null && !contentResult.getAllPass()) {
             //组装要保存的信息
             SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(),
                     commentFormDTO.getUserName(),CheckDataUtils.cate_two , CheckDataUtils.decision_one,
                     ModuleName.ISSUE_COMMENT.getCode(), textList,null, null,contentResult,
-                    null,null,mobile,"0");
+                    null,null,mobile,"0",deptDto);
             contentSecurityFeign.insertViolationsRecord(record);
             return new Result().error(CheckDataUtils.violations_message);
         }
@@ -278,7 +286,7 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev
         if(contentResult == null) {
             SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(),
                     commentFormDTO.getUserName(), CheckDataUtils.cate_two, null,ModuleName.ISSUE_COMMENT.getCode(), textList,
-                    null, commentEntity.getId(),null,null, null,mobile,"1");
+                    null, commentEntity.getId(),null,null, null,mobile,"1",deptDto);
             contentSecurityFeign.insertRecords(record);
         }
 
@@ -289,7 +297,7 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev
                 //组装要保存的信息
                 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(),
                         commentFormDTO.getUserName(), CheckDataUtils.cate_two, null, ModuleName.ISSUE_COMMENT.getCode(), textList,
-                        null,commentEntity.getId(), null,null,twoTypes,mobile,"0");
+                        null,commentEntity.getId(), null,null,twoTypes,mobile,"0",deptDto);
                 contentSecurityFeign.insertRecords(record);
             }
         }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
index aa00092a3..3d702ab64 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
@@ -29,6 +29,7 @@ import com.elink.esua.epdc.commons.tools.redis.RedisKeys;
 import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
 import com.elink.esua.epdc.commons.tools.security.content.CheckDataUtils;
 import com.elink.esua.epdc.commons.tools.security.content.ModuleName;
+import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsDTO;
 import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultDTO;
 import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultMessageDTO;
@@ -175,13 +176,15 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
         //内容审核
         List<String> textList = new ArrayList<>();
         textList.add(dto.getEventContent());
+        // 获取所有上级机构名称和ID拼接
+        ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(SecurityUser.getDeptId()).getData();
         CheckResultDTO contentResult = CheckDataUtils.checkContent(textList);
         CheckResultDTO imgResult = CheckDataUtils.checkImgs(dto.getImages());
         if((contentResult != null && !contentResult.getAllPass()) || (imgResult != null && !imgResult.getAllPass())){
             //组装要保存的信息
             SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(dto.getUserId(),
                     dto.getNickName(), CheckDataUtils.cate_two, CheckDataUtils.decision_one, ModuleName.ISSUE_SUBMIT.getCode(), textList,
-                    dto.getImages(), null,contentResult, imgResult,null,dto.getMobile(),"0");
+                    dto.getImages(), null,contentResult, imgResult,null,dto.getMobile(),"0",deptDto);
             contentSecurityFeign.insertViolationsRecord(record);
             throw new RenException(CheckDataUtils.violations_message);
 //                return new Result().error(CheckDataUtils.violations_message);
@@ -203,7 +206,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
         if(contentResult == null || imgResult == null) {
             SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(dto.getUserId(),
                     dto.getNickName(), CheckDataUtils.cate_two, null,ModuleName.ISSUE_SUBMIT.getCode(), textList,
-                    dto.getImages(), entity.getId(),null,null, null,dto.getMobile(),"1");
+                    dto.getImages(), entity.getId(),null,null, null,dto.getMobile(),"1",deptDto);
             contentSecurityFeign.insertRecords(record);
         }
 
@@ -214,7 +217,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
                 //组装要保存的信息
                 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(dto.getUserId(),
                         dto.getNickName(), CheckDataUtils.cate_two, null, ModuleName.ISSUE_SUBMIT.getCode(), textList,
-                        dto.getImages(), entity.getId(), null, null, twoTypes, dto.getMobile(), "0");
+                        dto.getImages(), entity.getId(), null, null, twoTypes, dto.getMobile(), "0",deptDto);
                 contentSecurityFeign.insertRecords(record);
             }
         }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java
index ce29951be..ff6d4d9c8 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java
@@ -1,6 +1,7 @@
 package com.elink.esua.epdc.modules.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.CompleteDeptDTO;
 import com.elink.esua.epdc.dto.DeptGridPlatformDTO;
@@ -102,4 +103,16 @@ public interface AdminFeignClient {
      */
     @GetMapping(value="sys/dept/getDeptTypeKey", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result getDeptTypeKey(@RequestParam("deptId") Long deptId);
+
+
+    /**
+     * 根据部门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);
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java
index 5d923aba6..ba418eab4 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java
@@ -1,6 +1,7 @@
 package com.elink.esua.epdc.modules.feign.fallback;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllDeptDTO;
 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;
@@ -59,4 +60,9 @@ public class AdminFeignClientFallback implements AdminFeignClient {
     public Result getDeptTypeKey(Long deptId) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptTypeKey",deptId);
     }
+
+    @Override
+    public Result<ParentAndAllDeptDTO> getParentAndAllDept(Long deptId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getParentAndAllDept", deptId);
+    }
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
index bdfcdf16f..700325f6d 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
@@ -32,6 +32,7 @@ import com.elink.esua.epdc.commons.tools.redis.RedisKeys;
 import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
 import com.elink.esua.epdc.commons.tools.security.content.CheckDataUtils;
 import com.elink.esua.epdc.commons.tools.security.content.ModuleName;
+import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsDTO;
 import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultDTO;
 import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultMessageDTO;
@@ -325,6 +326,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             if(null != user.getData()){
                 mobile = user.getData().getMobile();
             }
+            // 获取所有上级机构名称和ID拼接
+            ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(SecurityUser.getDeptId()).getData();
             List<String> textList = new ArrayList<>();
             textList.add(evaluationFormDTO.getEvaluationContent());
             CheckResultDTO contentResult = CheckDataUtils.checkContent(textList);
@@ -333,7 +336,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(),
                         userName,CheckDataUtils.cate_two , CheckDataUtils.decision_one,
                         ModuleName.ITEM_SATISFACTION.getCode(), textList,null, null,contentResult,
-                        null,null,mobile,"0");
+                        null,null,mobile,"0",deptDto);
             contentSecurityFeign.insertViolationsRecord(record);
                 return new Result().error(CheckDataUtils.violations_message);
             }
@@ -349,8 +352,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             if(contentResult == null) {
                 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(),
                         userName, CheckDataUtils.cate_two, null,ModuleName.ITEM_SATISFACTION.getCode(), textList,
-                        null, itemEntity.getId(),null,null, null,mobile,"1");
-                contentSecurityFeign.insertRecords(record);
+                        null, itemEntity.getId(),null,null, null,mobile,"1",deptDto);
+            contentSecurityFeign.insertRecords(record);
             }
 
             //判断是否为待审核
@@ -360,8 +363,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                     //组装要保存的信息
                     SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(),
                             userName, CheckDataUtils.cate_two, null, ModuleName.ITEM_SATISFACTION.getCode(), textList,
-                            null,itemEntity.getId(), null,null,twoTypes,mobile,"0");
-                    contentSecurityFeign.insertRecords(record);
+                            null,itemEntity.getId(), null,null,twoTypes,mobile,"0",deptDto);
+                contentSecurityFeign.insertRecords(record);
                 }
             }
             return new Result();
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java
index b23a78071..e73eb84fc 100755
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java
@@ -25,9 +25,11 @@ import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.security.content.CheckDataUtils;
 import com.elink.esua.epdc.commons.tools.security.content.ModuleName;
+import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsDTO;
 import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultDTO;
 import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultMessageDTO;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.UserDTO;
@@ -41,6 +43,7 @@ import com.elink.esua.epdc.modules.async.NewsTask;
 import com.elink.esua.epdc.modules.comment.dao.TopicCommentDao;
 import com.elink.esua.epdc.modules.comment.entity.TopicCommentEntity;
 import com.elink.esua.epdc.modules.comment.service.TopicCommentService;
+import com.elink.esua.epdc.modules.feign.AdminFeignClient;
 import com.elink.esua.epdc.modules.feign.ContentSecurityFeignClient;
 import com.elink.esua.epdc.modules.feign.UserFeignClient;
 import com.elink.esua.epdc.modules.rocketmq.dto.RejectRecordDTO;
@@ -79,6 +82,9 @@ public class TopicCommentServiceImpl extends BaseServiceImpl<TopicCommentDao, To
     @Autowired
     private UserFeignClient userInfoFeignClient;
 
+    @Autowired
+    private AdminFeignClient adminFeignClient;
+
     private static final Logger logger = LoggerFactory.getLogger(TopicServiceImpl.class);
 
 
@@ -144,13 +150,15 @@ public class TopicCommentServiceImpl extends BaseServiceImpl<TopicCommentDao, To
         if(null != user.getData()){
             mobile = user.getData().getMobile();
         }
+        // 获取所有上级机构名称和ID拼接
+        ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(SecurityUser.getDeptId()).getData();
         CheckResultDTO contentResult = CheckDataUtils.checkContent(textList);
         if (contentResult != null && !contentResult.getAllPass()) {
             //组装要保存的信息
             SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(),
                     commentFormDTO.getUserName(),CheckDataUtils.cate_two , CheckDataUtils.decision_one,
                     ModuleName.GROUP_TOPIC_COMMENT.getCode(), textList,null, null,contentResult,
-                    null,null,mobile,"0");
+                    null,null,mobile,"0",deptDto);
             contentSecurityFeign.insertViolationsRecord(record);
             return new Result().error(CheckDataUtils.violations_message);
         }
@@ -220,7 +228,7 @@ public class TopicCommentServiceImpl extends BaseServiceImpl<TopicCommentDao, To
         if(contentResult == null ) {
             SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(),
                     commentFormDTO.getUserName(), CheckDataUtils.cate_two, null,ModuleName.GROUP_TOPIC_COMMENT.getCode(), textList,
-                    null, commentEntity.getId(),null,null, null,mobile,"1");
+                    null, commentEntity.getId(),null,null, null,mobile,"1",deptDto);
             contentSecurityFeign.insertRecords(record);
         }
 
@@ -231,7 +239,7 @@ public class TopicCommentServiceImpl extends BaseServiceImpl<TopicCommentDao, To
                 //组装要保存的信息
                 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(),
                         commentFormDTO.getUserName(), CheckDataUtils.cate_two, null, ModuleName.GROUP_TOPIC_COMMENT.getCode(), textList,
-                        null, commentEntity.getId(), null, null, twoTypes, mobile, "0");
+                        null, commentEntity.getId(), null, null, twoTypes, mobile, "0",deptDto);
                 contentSecurityFeign.insertRecords(record);
             }
         }
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/AdminFeignClient.java
new file mode 100644
index 000000000..d8073d9ed
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/AdminFeignClient.java
@@ -0,0 +1,30 @@
+package com.elink.esua.epdc.modules.feign;
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllDeptDTO;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.modules.feign.fallback.AdminFeignClientFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+/**
+ * 管理端接口
+ *
+ * @author yujintao
+ * @email yujintao@elink-cn.com
+ * @date 2019/9/7 9:27
+ */
+@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = AdminFeignClientFallback.class)
+public interface AdminFeignClient {
+    /**
+     * 根据部门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);
+}
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/fallback/AdminFeignClientFallback.java
new file mode 100644
index 000000000..57203d7d7
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/fallback/AdminFeignClientFallback.java
@@ -0,0 +1,26 @@
+package com.elink.esua.epdc.modules.feign.fallback;
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllDeptDTO;
+import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.modules.feign.AdminFeignClient;
+import org.springframework.stereotype.Component;
+
+
+/**
+ * @author yujintao
+ * @email yujintao@elink-cn.com
+ * @date 2019/9/7 9:30
+ */
+@Component
+public class AdminFeignClientFallback implements AdminFeignClient {
+
+
+    @Override
+    public Result<ParentAndAllDeptDTO> getParentAndAllDept(Long deptId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getParentAndAllDept", deptId);
+    }
+
+
+}
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java
index 74337515b..615c0ce28 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java
@@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.security.content.CheckDataUtils;
 import com.elink.esua.epdc.commons.tools.security.content.ModuleName;
+import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsDTO;
 import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultDTO;
 import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultMessageDTO;
@@ -57,6 +58,7 @@ import com.elink.esua.epdc.dto.topic.result.TopicListResultDTO;
 import com.elink.esua.epdc.modules.async.NewsTask;
 import com.elink.esua.epdc.modules.async.TopicChangeToIssueTask;
 import com.elink.esua.epdc.modules.comment.service.TopicCommentService;
+import com.elink.esua.epdc.modules.feign.AdminFeignClient;
 import com.elink.esua.epdc.modules.feign.ContentSecurityFeignClient;
 import com.elink.esua.epdc.modules.feign.EventFeignClient;
 import com.elink.esua.epdc.modules.group.service.GroupService;
@@ -123,6 +125,9 @@ public class TopicServiceImpl extends BaseServiceImpl<TopicDao, TopicEntity> imp
     @Autowired
     private TopicImgDao topicImgDao;
 
+    @Autowired
+    private AdminFeignClient adminFeignClient;
+
     private static final Logger logger = LoggerFactory.getLogger(TopicServiceImpl.class);
 
     @Override
@@ -200,13 +205,15 @@ public class TopicServiceImpl extends BaseServiceImpl<TopicDao, TopicEntity> imp
         //内容审核
         List<String> textList = new ArrayList<>();
         textList.add(formDto.getTopicContent());
+        // 获取所有上级机构名称和ID拼接
+        ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(SecurityUser.getDeptId()).getData();
         CheckResultDTO contentResult = CheckDataUtils.checkContent(textList);
         CheckResultDTO imgResult = CheckDataUtils.checkImgs(formDto.getImages());
         if((contentResult != null && !contentResult.getAllPass()) || (imgResult != null && !imgResult.getAllPass())){
             //组装要保存的信息
             SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(formDto.getUserId(),
                     formDto.getNickname(), CheckDataUtils.cate_two, CheckDataUtils.decision_one, ModuleName.GROUP_TOPIC.getCode(), textList,
-                    formDto.getImages(), null,contentResult, imgResult,null,formDto.getMobile(),"0");
+                    formDto.getImages(), null,contentResult, imgResult,null,formDto.getMobile(),"0",deptDto);
             contentSecurityFeign.insertViolationsRecord(record);
             return new Result().error(CheckDataUtils.violations_message);
         }
@@ -239,8 +246,8 @@ public class TopicServiceImpl extends BaseServiceImpl<TopicDao, TopicEntity> imp
             if(contentResult == null || imgResult == null) {
                 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(formDto.getUserId(),
                         formDto.getNickname(), CheckDataUtils.cate_two, null,ModuleName.GROUP_TOPIC.getCode(), textList,
-                        formDto.getImages(), entity.getId(),null,null, null,formDto.getMobile(),"1");
-                contentSecurityFeign.insertRecords(record);
+                        formDto.getImages(), entity.getId(),null,null, null,formDto.getMobile(),"1",deptDto);
+            contentSecurityFeign.insertRecords(record);
             }
             //保存待审核记录
             if (contentResult != null && imgResult != null) {
@@ -249,8 +256,8 @@ public class TopicServiceImpl extends BaseServiceImpl<TopicDao, TopicEntity> imp
                     //组装要保存的信息
                     SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(formDto.getUserId(),
                             formDto.getNickname(), CheckDataUtils.cate_two, null,ModuleName.GROUP_TOPIC.getCode(), textList,
-                            formDto.getImages(), entity.getId(),null,null, twoTypes,formDto.getMobile(),"0");
-                    contentSecurityFeign.insertRecords(record);
+                            formDto.getImages(), entity.getId(),null,null, twoTypes,formDto.getMobile(),"0",deptDto);
+                contentSecurityFeign.insertRecords(record);
                 }
             }
 
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
index fb7b2657d..0f4e2fbfc 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
@@ -35,6 +35,7 @@ import com.elink.esua.epdc.commons.tools.constant.StrConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.security.content.CheckDataUtils;
 import com.elink.esua.epdc.commons.tools.security.content.ModuleName;
+import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsDTO;
 import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultDTO;
 import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultMessageDTO;
@@ -57,6 +58,7 @@ import com.elink.esua.epdc.modules.activity.entity.ActUserRelationEntity;
 import com.elink.esua.epdc.modules.activity.service.ActBannerService;
 import com.elink.esua.epdc.modules.activity.service.ActInfoService;
 import com.elink.esua.epdc.modules.async.NewsTask;
+import com.elink.esua.epdc.modules.feign.AdminFeignClient;
 import com.elink.esua.epdc.modules.feign.ContentSecurityFeignClient;
 import com.elink.esua.epdc.modules.feign.JobFeignClient;
 import com.elink.esua.epdc.modules.feign.UserInfoFeignClient;
@@ -98,6 +100,8 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
     private ActBannerDao actBannerDao;
     @Autowired
     private ActClockPicDao actClockPicDao;
+    @Autowired
+    private AdminFeignClient adminFeignClient;
 
     private static final Logger logger = LoggerFactory.getLogger(ActInfoServiceImpl.class);
 
@@ -155,13 +159,15 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
         List<String> imgList = new ArrayList<>();
         imgList.add(dto.getHeadPic());
         imgList.add(dto.getBannerUrl());
+        // 获取所有上级机构名称和ID拼接
+        ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(SecurityUser.getDeptId()).getData();
         CheckResultDTO contentResult = CheckDataUtils.checkContent(imgList);
         CheckResultDTO imgResult = CheckDataUtils.checkImgs(imgList);
         if((contentResult != null && !contentResult.getAllPass()) || (imgResult != null && !imgResult.getAllPass())){
             //组装要保存的信息
             SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(userId,
                     userName, CheckDataUtils.cate_one, CheckDataUtils.decision_one, ModuleName.HELP_ACTIVITY.getCode(), textList,
-                    imgList, null,contentResult, imgResult,null,dto.getTel(),"0");
+                    imgList, null,contentResult, imgResult,null,dto.getTel(),"0",deptDto);
             contentSecurityFeign.insertViolationsRecord(record);
             return new Result().error(CheckDataUtils.violations_message);
         }
@@ -176,8 +182,8 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
             if(contentResult == null || imgResult == null) {
                 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(userId,
                         userName, CheckDataUtils.cate_one, null,ModuleName.HELP_ACTIVITY.getCode(), textList,
-                        imgList, entity.getId(),null,null, null,dto.getTel(),"1");
-                contentSecurityFeign.insertRecords(record);
+                        imgList, entity.getId(),null,null, null,dto.getTel(),"1",deptDto);
+            contentSecurityFeign.insertRecords(record);
             }
 
             //保存待审核记录
@@ -187,8 +193,8 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
                     //组装要保存的信息
                     SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(userId,
                             userName, CheckDataUtils.cate_one, null,ModuleName.HELP_ACTIVITY.getCode(), textList,
-                            imgList, entity.getId(),null,null, twoTypes,dto.getTel(),"0");
-                    contentSecurityFeign.insertRecords(record);
+                            imgList, entity.getId(),null,null, twoTypes,dto.getTel(),"0",deptDto);
+                contentSecurityFeign.insertRecords(record);
                 }
             }
             // 创建定时任务（活动开始后将未审核的报名人员自动置为审核通过或不通过）
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java
index 21644cdc3..83a09229c 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java
@@ -34,6 +34,7 @@ import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.security.content.CheckDataUtils;
 import com.elink.esua.epdc.commons.tools.security.content.ModuleName;
+import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsDTO;
 import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultDTO;
 import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultMessageDTO;
@@ -55,6 +56,7 @@ import com.elink.esua.epdc.modules.activity.entity.ActUserClockLogEntity;
 import com.elink.esua.epdc.modules.activity.entity.ActUserPointsLogEntity;
 import com.elink.esua.epdc.modules.activity.service.*;
 import com.elink.esua.epdc.modules.async.NewsTask;
+import com.elink.esua.epdc.modules.feign.AdminFeignClient;
 import com.elink.esua.epdc.modules.feign.ContentSecurityFeignClient;
 import com.elink.esua.epdc.modules.feign.PointsFeignClient;
 import com.elink.esua.epdc.modules.feign.UserInfoFeignClient;
@@ -103,6 +105,9 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
     @Autowired
     private ContentSecurityFeignClient contentSecurityFeign;
 
+    @Autowired
+    private AdminFeignClient adminFeignClient;
+
     private static final Logger logger = LoggerFactory.getLogger(ActUserClockLogServiceImpl.class);
 
     @Override
@@ -313,6 +318,8 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
         if(null != user.getData()){
             mobile = user.getData().getMobile();
         }
+        // 获取所有上级机构名称和ID拼接
+        ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(SecurityUser.getDeptId()).getData();
         List<String> textList = new ArrayList<>();
         textList.add(appActUserClockLogDTO.getClockDesc());
         CheckResultDTO contentResult = CheckDataUtils.checkContent(textList);
@@ -321,7 +328,7 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
             //组装要保存的信息
             SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(appActUserClockLogDTO.getUserId(),
                     userName, CheckDataUtils.cate_two, CheckDataUtils.decision_one, ModuleName.HELP_SIGNIN.getCode(), textList,
-                    appActUserClockLogDTO.getImages(), null,contentResult, imgResult,null,mobile,"0");
+                    appActUserClockLogDTO.getImages(), null,contentResult, imgResult,null,mobile,"0",deptDto);
             contentSecurityFeign.insertViolationsRecord(record);
             return new Result().error(CheckDataUtils.violations_message);
         }
@@ -364,7 +371,7 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
         if(contentResult == null || imgResult == null) {
             SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(appActUserClockLogDTO.getUserId(),
                     userName, CheckDataUtils.cate_two, null,ModuleName.HELP_SIGNIN.getCode(), textList,
-                    appActUserClockLogDTO.getImages(), entity.getId(),null,null, null,mobile,"1");
+                    appActUserClockLogDTO.getImages(), entity.getId(),null,null, null,mobile,"1",deptDto);
             contentSecurityFeign.insertRecords(record);
         }
         //保存待审核记录
@@ -374,7 +381,7 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
                 //组装要保存的信息
                 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(appActUserClockLogDTO.getUserId(),
                         userName, CheckDataUtils.cate_two, null,ModuleName.HELP_SIGNIN.getCode(), textList,
-                        appActUserClockLogDTO.getImages(), entity.getId(),null,null, twoTypes,mobile,"0");
+                        appActUserClockLogDTO.getImages(), entity.getId(),null,null, twoTypes,mobile,"0",deptDto);
                 contentSecurityFeign.insertRecords(record);
             }
         }
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java
new file mode 100644
index 000000000..33efeaf47
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java
@@ -0,0 +1,35 @@
+package com.elink.esua.epdc.modules.feign;
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllDeptDTO;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.modules.feign.fallback.AdminFeignClientFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+
+/**
+ * 管理端接口
+ *
+ * @author yujintao
+ * @email yujintao@elink-cn.com
+ * @date 2019/9/7 9:27
+ */
+@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = AdminFeignClientFallback.class)
+public interface AdminFeignClient {
+
+
+    /**
+     * 根据部门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);
+
+
+}
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java
new file mode 100644
index 000000000..57203d7d7
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java
@@ -0,0 +1,26 @@
+package com.elink.esua.epdc.modules.feign.fallback;
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllDeptDTO;
+import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.modules.feign.AdminFeignClient;
+import org.springframework.stereotype.Component;
+
+
+/**
+ * @author yujintao
+ * @email yujintao@elink-cn.com
+ * @date 2019/9/7 9:30
+ */
+@Component
+public class AdminFeignClientFallback implements AdminFeignClient {
+
+
+    @Override
+    public Result<ParentAndAllDeptDTO> getParentAndAllDept(Long deptId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getParentAndAllDept", deptId);
+    }
+
+
+}