【内容审核】-【events、group模块取值方式调整】-（王童）-2020/8/6

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

@@ -42,6 +42,7 @@ public class CommentServiceImpl implements CommentService {
         commentFormDTO.setUserId(userDetail.getUserId());
         commentFormDTO.setUserName(userDetail.getNickname());
         commentFormDTO.setUserFace(userDetail.getFaceImg());
+        commentFormDTO.setDeptId(userDetail.getGridId());
         SubmitCommentFormDTO submitCommentFormDTO = ConvertUtils.sourceToTarget(commentFormDTO, SubmitCommentFormDTO.class);
 	    if (UserTagUtils.containIdentity(userDetail.getUserTagInfos(), UserTagEnum.PARTY_MEMBER)) {
 		    submitCommentFormDTO.setPartyFlag(YesOrNoEnum.YES.value());

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

@@ -52,6 +52,8 @@ public class ItemServiceImpl implements ItemService {
             return new Result<ItemDetailResultDTO>().error("获取用户信息失败");
         }
         evaluationFormDTO.setUserId(userDetail.getUserId());
+        evaluationFormDTO.setUserName(userDetail.getNickname());
+        evaluationFormDTO.setDeptId(userDetail.getGridId());
         return itemFeignClient.evaluation(evaluationFormDTO);
     }
 

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

@@ -40,6 +40,7 @@ public class TopicCommentServiceImpl implements TopicCommentService {
         topicCommentFormDTO.setUserId(userDetail.getUserId());
         topicCommentFormDTO.setUserName(userDetail.getNickname());
         topicCommentFormDTO.setUserFace(userDetail.getFaceImg());
+        topicCommentFormDTO.setDeptId(userDetail.getGridId());
         if (UserTagUtils.containIdentity(userDetail.getUserTagInfos(), UserTagEnum.PARTY_MEMBER)) {
             topicCommentFormDTO.setPartyFlag(YesOrNoEnum.YES.value());
         } else {

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/CommentFormDTO.java

@@ -53,4 +53,9 @@ public class CommentFormDTO {
      */
     private Boolean isConReview = false;
 
+
+    /**
+     * 部门id
+     */
+    private Long deptId;
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/SubmitCommentFormDTO.java

@@ -52,4 +52,9 @@ public class SubmitCommentFormDTO implements Serializable {
 	 *是否提交为内容待审核状态
 	 */
 	private Boolean isConReview = false;
+
+	/**
+	 * 部门id
+	 */
+	private Long deptId;
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/EvaluationFormDTO.java

@@ -31,4 +31,14 @@ public class EvaluationFormDTO implements Serializable {
      */
     private Boolean isConReview = false;
 
+    /**
+     * 昵称
+     */
+    private String userName;
+
+    /**
+     * 部门id
+     */
+    private Long deptId;
+
 }

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

@@ -29,7 +29,6 @@ import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllD
 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;
@@ -171,7 +170,7 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev
             mobile = user.getData().getMobile();
         }
         // 获取所有上级机构名称和ID拼接
-        ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(SecurityUser.getDeptId()).getData();
+        ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(commentFormDTO.getDeptId()).getData();
         CheckResultDTO contentResult = CheckDataUtils.checkContent(textList);
         if (!isConReview && (contentResult != null && !contentResult.getAllPass())) {
             //组装要保存的信息

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

@@ -177,7 +177,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
         List<String> textList = new ArrayList<>();
         textList.add(dto.getEventContent());
         // 获取所有上级机构名称和ID拼接
-        ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(SecurityUser.getDeptId()).getData();
+        ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(dto.getGridId()).getData();
         CheckResultDTO contentResult = CheckDataUtils.checkContent(textList);
         CheckResultDTO imgResult = CheckDataUtils.checkImgs(dto.getImages());
         if(!isConReview &&

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

@@ -318,24 +318,20 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
 
             //内容审核
             Boolean isConReview = evaluationFormDTO.getIsConReview();
-            String userName = null;
-            if(null != SecurityUser.getUser()){
-                userName = SecurityUser.getUser().getUsername();
-            }
             String mobile = null;
             Result<UserDTO> user =  userInfoFeignClient.getUserInfoById(evaluationFormDTO.getUserId());
             if(null != user.getData()){
                 mobile = user.getData().getMobile();
             }
             // 获取所有上级机构名称和ID拼接
-            ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(SecurityUser.getDeptId()).getData();
+            ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(evaluationFormDTO.getDeptId()).getData();
             List<String> textList = new ArrayList<>();
             textList.add(evaluationFormDTO.getEvaluationContent());
             CheckResultDTO contentResult = CheckDataUtils.checkContent(textList);
             if (!isConReview && (contentResult != null && !contentResult.getAllPass())) {
                 //组装要保存的信息
                 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(),
-                        userName,CheckDataUtils.cate_two , CheckDataUtils.decision_one,
+                        evaluationFormDTO.getUserName(),CheckDataUtils.cate_two , CheckDataUtils.decision_one,
                         ModuleName.ITEM_SATISFACTION.getCode(), textList,null, null,contentResult,
                         null,null,mobile,"0",deptDto);
             contentSecurityFeign.insertViolationsRecord(record);
@@ -352,7 +348,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             //接口异常，保存至待审核信息
             if(contentResult == null && !isConReview) {
                 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(),
-                        userName, CheckDataUtils.cate_two, null,ModuleName.ITEM_SATISFACTION.getCode(), textList,
+                        evaluationFormDTO.getUserName(), CheckDataUtils.cate_two, null,ModuleName.ITEM_SATISFACTION.getCode(), textList,
                         null, itemEntity.getId(),null,null, null,mobile,"1",deptDto);
             contentSecurityFeign.insertRecords(record);
             }
@@ -368,7 +364,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
                     //组装要保存的信息
                     SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(),
-                            userName, CheckDataUtils.cate_two, null, ModuleName.ITEM_SATISFACTION.getCode(), textList,
+                            evaluationFormDTO.getUserName(), CheckDataUtils.cate_two, null, ModuleName.ITEM_SATISFACTION.getCode(), textList,
                             null,itemEntity.getId(), null,null,twoTypes,mobile,"0",deptDto);
                 contentSecurityFeign.insertRecords(record);
                 }

esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/comment/TopicCommentFormDTO.java

@@ -55,4 +55,9 @@ public class TopicCommentFormDTO {
      */
     private Boolean isConReview = false;
 
+    /**
+     * 部门id
+     */
+    private Long deptId;
+
 }

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java

@@ -29,7 +29,6 @@ import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllD
 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;
@@ -152,7 +151,7 @@ public class TopicCommentServiceImpl extends BaseServiceImpl<TopicCommentDao, To
             mobile = user.getData().getMobile();
         }
         // 获取所有上级机构名称和ID拼接
-        ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(SecurityUser.getDeptId()).getData();
+        ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(commentFormDTO.getDeptId()).getData();
         CheckResultDTO contentResult = CheckDataUtils.checkContent(textList);
         if (!isConReview && (contentResult != null && !contentResult.getAllPass())) {
             //组装要保存的信息

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java

@@ -207,7 +207,7 @@ 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();
+        ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(formDto.getGridId()).getData();
         CheckResultDTO contentResult = CheckDataUtils.checkContent(textList);
         CheckResultDTO imgResult = CheckDataUtils.checkImgs(formDto.getImages());
         if(!isConReview &&