From 8d7d55debf26f4c61d2c3f4dce05c114e3c018e5 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 16 Sep 2020 14:44:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FactOriginTopicMainDailyServiceImpl.java   | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginTopicMainDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginTopicMainDailyServiceImpl.java
index 88b9e87ae2..8d2da496ee 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginTopicMainDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginTopicMainDailyServiceImpl.java
@@ -32,6 +32,7 @@ import com.epmet.entity.evaluationindex.extract.FactOriginTopicMainDailyEntity;
 import com.epmet.service.evaluationindex.extract.FactOriginTopicMainDailyService;
 import com.epmet.service.org.CustomerGridService;
 import com.epmet.service.topic.TopicService;
+import com.epmet.service.user.UserService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.ListUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,7 +61,8 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOri
     private CustomerGridService customerGridService;
     @Autowired
     private FactOriginTopicLogDailyDao factOriginTopicLogDailyDao;
-
+    @Autowired
+    private UserService userService;
     /**
      * @param customerId 客户id
      * @param dateId     yyyyMMdd
@@ -140,6 +142,8 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOri
         Map<String, Object> map=new HashMap<>();
         List<FactOriginTopicMainDailyEntity> mainDailyEntityList=new ArrayList<>();
         List<FactOriginTopicLogDailyEntity> logDailyEntityList=new ArrayList<>();
+        List<String> userIds = topicOriginInfoList.stream().map(topic -> topic.getOperateUserId()).distinct().collect(Collectors.toList());
+        Map<String,Integer> userIsPartyMap = userService.selectUserIsParty(userIds);
         for(TopicOriginInfoDTO topicOriginInfoDTO:topicOriginInfoList){
             GridInfoDTO gridInfoDTO=gridMap.get(topicOriginInfoDTO.getGridId());
             if(null==gridInfoDTO){
@@ -162,7 +166,11 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOri
                 mainDailyEntity.setPid(gridInfoDTO.getPid());
                 //TODO
                 //话题发布人是否是党员：1是党员0不是。 默认0
-                mainDailyEntity.setCreateTopicUserIsParty(false);
+                if (null != userIsPartyMap && null != userIsPartyMap.get(topicOriginInfoDTO.getOperateUserId())) {
+                    mainDailyEntity.setCreateTopicUserIsParty(userIsPartyMap.get(topicOriginInfoDTO.getOperateUserId()) == NumConstant.ONE ? true : false);
+                } else {
+                    mainDailyEntity.setCreateTopicUserIsParty(false);
+                }
 
                 mainDailyEntityList.add(mainDailyEntity);
             }
@@ -174,7 +182,11 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOri
             logDailyEntity.setAgencyId(gridInfoDTO.getAgencyId());
             logDailyEntity.setPid(gridInfoDTO.getPid());
             //TODO
-            logDailyEntity.setOperateUserIsParty(false);
+            if (null != userIsPartyMap && null != userIsPartyMap.get(topicOriginInfoDTO.getOperateUserId())) {
+                logDailyEntity.setOperateUserIsParty(userIsPartyMap.get(topicOriginInfoDTO.getOperateUserId()) == NumConstant.ONE ? true : false);
+            } else {
+                logDailyEntity.setOperateUserIsParty(false);
+            }
             logDailyEntityList.add(logDailyEntity);
         }
         map.put("main",mainDailyEntityList);