From 50c0bd57d81f638943f1d945cbd6ba2a2289628f Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期五, 30 十二月 2022 13:33:09 +0800
Subject: [PATCH] fix: 用户栏目设置消息相关接口修改

---
 ycl-platform/src/main/java/com/ycl/service/message/impl/MessageColumnServiceImpl.java |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageColumnServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageColumnServiceImpl.java
index e38d818..4d34676 100644
--- a/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageColumnServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageColumnServiceImpl.java
@@ -7,8 +7,15 @@
 import com.ycl.dto.message.MessageColumnParam;
 import com.ycl.entity.message.MessageColumn;
 import com.ycl.mapper.message.MessageColumnMapper;
+import com.ycl.mapper.message.MessageMapper;
 import com.ycl.service.message.IMessageColumnService;
+import com.ycl.vo.message.MessageColumnUserVO;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -20,6 +27,10 @@
  */
 @Service
 public class MessageColumnServiceImpl extends ServiceImpl<MessageColumnMapper, MessageColumn> implements IMessageColumnService {
+
+    @Resource
+    MessageMapper messageMapper;
+
     @Override
     public IPage<MessageColumn> list(MessageColumnParam messageColumnParam) {
         Page<MessageColumn> page = new Page<>(messageColumnParam.getCurrent(), messageColumnParam.getPageSize());
@@ -28,4 +39,21 @@
         Page<MessageColumn> result = baseMapper.selectPage(page, queryWrapper);
         return result;
     }
+
+    @Override
+    public List<MessageColumnUserVO> listColumnUser(Integer id) {
+        List<MessageColumnUserVO> messageColumnUserVOS = messageMapper.selectUserColumn(id);
+        List<Long> ids = messageColumnUserVOS.stream().map(item -> item.getId()).collect(Collectors.toList());
+        baseMapper
+                .selectList(new LambdaQueryWrapper<MessageColumn>().eq(MessageColumn::getIsShow, 1))
+                .stream()
+                .forEach(item -> {
+                    if (!ids.contains(item.getId())) {
+                        MessageColumnUserVO messageColumnUserVO = new MessageColumnUserVO();
+                        BeanUtils.copyProperties(item, messageColumnUserVO);
+                        messageColumnUserVOS.add(messageColumnUserVO);
+                    }
+                });
+        return messageColumnUserVOS;
+    }
 }

--
Gitblit v1.8.0