Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

liyong

2 天以前 88ae1e650fc2fc30928edfe8f3cc39108d8d1ccd

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

@@ -15,7 +15,6 @@
import com.ruoyi.project.system.mapper.SysUserMapper;

import com.ruoyi.project.system.service.ISysNoticeService;

import lombok.RequiredArgsConstructor;

import org.springframework.context.annotation.Lazy;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;



@@ -35,8 +34,6 @@
    private final SysUserMapper userMapper;

    private final SysDeptMapper deptMapper;

    private final SysUserDeptMapper userDeptMapper;

    @Lazy

    private final ISysNoticeService sysNoticeService;

    private final UnipushService unipushService;



    /**

@@ -133,7 +130,7 @@
        List<SysNotice> sysNotices = consigneeId.stream()

                .map(it -> convertSysNotice(title, message, it, tenantId, jumpPath, unipushService.convertWebPathToAppPath(jumpPath), userId))

                .collect(Collectors.toList());

        sysNoticeService.saveBatch(sysNotices);

        noticeMapper.insert(sysNotices);

        try {

            unipushService.sendClientMessage(sysNotices);

        } catch (Exception e) {

@@ -189,8 +186,7 @@
                        userId

                ))

                .collect(Collectors.toList());



        sysNoticeService.saveBatch(collect);

        noticeMapper.insert(collect);

        try {

            unipushService.sendClientMessage(collect);

        } catch (Exception e) {