fix: 修复同一公司下其他账号无法收到通知

gongchunyi

9 天以前 03c38e24381f31841dc8808cdb1669866348dcac

 src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java

@@ -1,7 +1,27 @@
package com.ruoyi.project.system.service.impl;



import java.util.ArrayList;

import java.util.List;

import java.util.Map;

import java.util.Objects;

import java.util.stream.Collectors;



import com.baomidou.mybatisplus.core.conditions.Wrapper;

import com.baomidou.mybatisplus.core.metadata.IPage;

import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

import com.github.xiaoymin.knife4j.core.util.StrUtil;

import com.ruoyi.common.utils.SecurityUtils;

import com.ruoyi.project.system.domain.SysDept;

import com.ruoyi.project.system.domain.SysUser;

import com.ruoyi.project.system.domain.SysUserDept;

import com.ruoyi.project.system.mapper.SysDeptMapper;

import com.ruoyi.project.system.mapper.SysUserDeptMapper;

import com.ruoyi.project.system.mapper.SysUserMapper;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.context.annotation.Lazy;

import org.springframework.stereotype.Service;

import com.ruoyi.project.system.domain.SysNotice;

import com.ruoyi.project.system.mapper.SysNoticeMapper;

@@ -9,18 +29,31 @@


/**

 * 公告 服务层实现

 * 
 *

 * @author ruoyi

 */

@Service

public class SysNoticeServiceImpl implements ISysNoticeService

{

public class SysNoticeServiceImpl  extends ServiceImpl<SysNoticeMapper, SysNotice> implements ISysNoticeService {



    @Autowired

    private SysNoticeMapper noticeMapper;



    @Autowired

    private SysUserMapper userMapper;



    @Autowired

    private SysDeptMapper deptMapper;



    @Autowired

    private SysUserDeptMapper userDeptMapper;



    @Autowired

    @Lazy

    private ISysNoticeService sysNoticeService;



    /**

     * 查询公告信息

     * 
     *

     * @param noticeId 公告ID

     * @return 公告信息

     */

@@ -32,19 +65,18 @@


    /**

     * 查询公告列表

     * 
     *

     * @param notice 公告信息

     * @return 公告集合

     */

    @Override

    public List<SysNotice> selectNoticeList(SysNotice notice)

    {

        return noticeMapper.selectNoticeList(notice);

    public IPage<SysNotice> selectNoticeList(SysNotice notice, Page page) {

        return noticeMapper.selectNoticeList(notice, page);

    }



    /**

     * 新增公告

     * 
     *

     * @param notice 公告信息

     * @return 结果

     */

@@ -56,7 +88,7 @@


    /**

     * 修改公告

     * 
     *

     * @param notice 公告信息

     * @return 结果

     */

@@ -68,7 +100,7 @@


    /**

     * 删除公告对象

     * 
     *

     * @param noticeId 公告ID

     * @return 结果

     */

@@ -80,7 +112,7 @@


    /**

     * 批量删除公告信息

     * 
     *

     * @param noticeIds 需要删除的公告ID

     * @return 结果

     */

@@ -89,4 +121,93 @@
    {

        return noticeMapper.deleteNoticeByIds(noticeIds);

    }



    @Override

    public Long getCount(Long consigneeId) {

        return noticeMapper.selectCount(Wrappers.<SysNotice>lambdaQuery()

                .eq(SysNotice::getStatus, "0")

                .eq(SysNotice::getConsigneeId, consigneeId));

    }



    @Override

    public int readAll() {

        Long userId = SecurityUtils.getUserId();

        return noticeMapper.update(null, Wrappers.<SysNotice>lambdaUpdate()

                .eq(SysNotice::getConsigneeId, userId)

                .eq(SysNotice::getStatus, "0")

                .set(SysNotice::getStatus, "1"));

    }



    @Override

    public void simpleNoticeByUser(String title, String message,  List<Long> consigneeId, Long tenantId,

                                    String jumpPath) {

        Long userId = SecurityUtils.getLoginUser().getUserId();

        List<SysNotice> sysNotices = consigneeId.stream().map(it -> convertSysNotice(title, message, it,tenantId, jumpPath, userId)).collect(Collectors.toList());

        sysNoticeService.saveBatch(sysNotices);

    }



    @Override

    public void simpleNoticeAll(String title, String message, Long rootDeptId, String jumpPath) {

        Long userId = SecurityUtils.getLoginUser().getUserId();

        if (userId == null) {

            return;

        }



        //  查所有子部门

        List<SysDept> childrenDepts = deptMapper.selectChildrenDeptById(rootDeptId);



        //  组装 deptIds

        List<Long> deptIds = childrenDepts.stream()

                .map(SysDept::getDeptId)

                .collect(Collectors.toList());

        deptIds.add(rootDeptId);



        //  查用户ID

        List<Long> userIds = userDeptMapper.selectList(

                        Wrappers.<SysUserDept>lambdaQuery()

                                .in(SysUserDept::getDeptId, deptIds)

                ).stream()

                .map(SysUserDept::getUserId)

                .distinct()

                .collect(Collectors.toList());



        if (userIds.isEmpty()) {

            return;

        }



        //  查用户

        List<SysUser> sysUsers = userMapper.selectList(

                Wrappers.<SysUser>lambdaQuery()

                        .eq(SysUser::getStatus, "0")

                        .in(SysUser::getUserId, userIds)

        );



        //  发通知

        List<SysNotice> collect = sysUsers.stream()

                .map(it -> convertSysNotice(

                        title,

                        message,

                        it.getUserId(),

                        it.getTenantId(),

                        jumpPath,

                        userId

                ))

                .collect(Collectors.toList());



        sysNoticeService.saveBatch(collect);

    }





    private SysNotice convertSysNotice(String title,String message,Long consigneeId, Long tenantId,String jumpPath,Long currentUserId) {

        SysNotice sysNotice = new SysNotice();

        sysNotice.setNoticeType("1");

        sysNotice.setNoticeTitle(title);//标题

        sysNotice.setNoticeContent(message);

        sysNotice.setStatus("0");

        sysNotice.setConsigneeId(consigneeId);

        sysNotice.setSenderId(currentUserId);

        sysNotice.setJumpPath(jumpPath);

        sysNotice.setTenantId(tenantId);

        return sysNotice;

    }

}