From d038423f978cb422f881705d0255ff768d09abea Mon Sep 17 00:00:00 2001
From: YXY <932687738@qq.com>
Date: Tue, 22 Aug 2023 23:44:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AE=8C=E6=88=90=E7=9A=84?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/LarkActiveServiceImpl.java   | 42 +++++++++++++------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkActiveServiceImpl.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkActiveServiceImpl.java
index 3ef29d7..6c6c7c5 100644
--- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkActiveServiceImpl.java
+++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkActiveServiceImpl.java
@@ -4,6 +4,7 @@ import com.ruoyi.common.enums.FlagStatus;
 import com.ruoyi.common.enums.LarkActiveStageEnum;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.flyingbook.domain.LarkActive;
+import com.ruoyi.flyingbook.domain.LarkLoginLog;
 import com.ruoyi.flyingbook.domain.LarkUserActiveRelatoin;
 import com.ruoyi.flyingbook.domain.edi.ResponseVo;
 import com.ruoyi.flyingbook.domain.larkactive.LarkActiveRequest;
@@ -11,6 +12,7 @@ import com.ruoyi.flyingbook.domain.larkactive.LarkActiveVo;
 import com.ruoyi.flyingbook.mapper.LarkActiveMapper;
 import com.ruoyi.flyingbook.mapper.LarkUserActiveRelatoinMapper;
 import com.ruoyi.flyingbook.service.ILarkActiveService;
+import com.ruoyi.flyingbook.service.ILarkLoginLogService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -19,6 +21,8 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 【请填写功能名称】Service业务层处理
@@ -32,6 +36,8 @@ public class LarkActiveServiceImpl implements ILarkActiveService {
     private LarkActiveMapper larkActiveMapper;
     @Autowired
     private LarkUserActiveRelatoinMapper larkUserActiveRelatoinMapper;
+    @Autowired
+    private ILarkLoginLogService larkLoginLogService;
 
     /**
      * 查询【请填写功能名称】
@@ -47,18 +53,18 @@ public class LarkActiveServiceImpl implements ILarkActiveService {
     @Override
     public LarkActiveVo getActiveInfo(LarkActiveRequest request) {
         LarkActiveVo result = new LarkActiveVo();
-        if (request == null || StringUtils.isBlank(request.getLarkActiveName()) || StringUtils.isBlank(request.getUserName())){
+        if (request == null || StringUtils.isBlank(request.getLarkActiveName()) || StringUtils.isBlank(request.getUserName())) {
             return result;
         }
 
-        List<LarkActive> larkActiveList = larkActiveMapper.selectLarkActiveByName(request.getLarkActiveName(),FlagStatus.OK.getCode());
+        List<LarkActive> larkActiveList = larkActiveMapper.selectLarkActiveByName(request.getLarkActiveName(), FlagStatus.OK.getCode());
 
-        if (CollectionUtils.isEmpty(larkActiveList)){
+        if (CollectionUtils.isEmpty(larkActiveList)) {
             return result;
         }
         LarkActive active = larkActiveList.get(0);
-        BeanUtils.copyProperties(active,result);
-        if (StringUtils.isNotBlank(request.getUserName())){
+        BeanUtils.copyProperties(active, result);
+        if (StringUtils.isNotBlank(request.getUserName())) {
             LarkUserActiveRelatoin relatoin = new LarkUserActiveRelatoin();
             relatoin.setFlag(FlagStatus.OK.getCode());
             relatoin.setActiveId(active.getId());
@@ -82,18 +88,18 @@ public class LarkActiveServiceImpl implements ILarkActiveService {
 
     @Override
     public ResponseVo<LarkActive> queryPage(LarkActiveRequest request) {
-        if (request == null || StringUtils.isBlank(request.getCompanyName())){
-            return new ResponseVo(request.getCurrentPage(),request.getPageSize());
+        if (request == null || StringUtils.isBlank(request.getCompanyName())) {
+            return new ResponseVo(request.getCurrentPage(), request.getPageSize());
         }
         request.setFlag(FlagStatus.OK.getCode());
         LarkActive larkActive = new LarkActive();
-        BeanUtils.copyProperties(request,larkActive);
+        BeanUtils.copyProperties(request, larkActive);
         Integer count = larkActiveMapper.count(larkActive);
-        if (count > 0){
+        if (count > 0) {
             List<LarkActive> larkActives = larkActiveMapper.queryPage(request);
-            return new ResponseVo(request.getCurrentPage(),request.getPageSize(),larkActives,count);
+            return new ResponseVo(request.getCurrentPage(), request.getPageSize(), larkActives, count);
         }
-        return new ResponseVo(request.getCurrentPage(),request.getPageSize(),null,count);
+        return new ResponseVo(request.getCurrentPage(), request.getPageSize(), null, count);
     }
 
     @Override
@@ -102,7 +108,19 @@ public class LarkActiveServiceImpl implements ILarkActiveService {
         larkActive.setFlag(FlagStatus.OK.getCode());
         Integer count = larkActiveMapper.count(larkActive);
         List<String> nameList = larkUserActiveRelatoinMapper.queryCompleteActiveUserName(count, companyName);
-        return String.join(",",nameList);
+        if (CollectionUtils.isNotEmpty(nameList)) {
+            Map<String, LarkLoginLog> userInfoMap = larkLoginLogService.queryByOpenId(nameList);
+            nameList = nameList.stream()
+                    .filter(r -> {
+                        return userInfoMap.containsKey(r);
+                    })
+                    .map(r -> {
+                        return userInfoMap.get(r).getUserName();
+                    })
+                    .distinct().collect(Collectors.toList());
+            return String.join(",", nameList);
+        }
+        return "";
     }
 
     @Override