Merge branch 'jtwy' into dev_New

zss

2 天以前 645fe0426017b280aa107b9363d37dc85470601b

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

@@ -126,7 +126,7 @@
    }



    @Override

    public void simpleNoticeByRoles(final String title, String message, List<String> needPushRoles,

    public void simpleNoticeByRoles(final String title, String message, Long tenantId, List<String> needPushRoles,

                                             final String jumpPath) {

        Long userId = SecurityUtils.getUserId();

        if (StrUtil.isBlank(message) || CollectionUtils.isEmpty(needPushRoles)) {

@@ -136,34 +136,34 @@
        rolesWithAdmin.add("管理员");

        List<SysNotice> collect = rolesWithAdmin.stream()

                .flatMap(it -> userMapper.getUserByRole(it).stream())

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

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

                .collect(Collectors.toList());

        sysNoticeService.insertBatch(collect);

    }



    @Override

    public void simpleNoticeByPerms(String title, String message, List<String> needPerms,

    public void simpleNoticeByPerms(String title, String message, Long tenantId, List<String> needPerms,

                                             String jumpPath) {

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

        if (StrUtil.isBlank(message) || CollectionUtils.isEmpty(needPerms)) {

            return;

        }

        List<SysNotice> collect = userMapper.getUserByPerms(needPerms).stream().map(it -> convertSysNotice(title, message, it, jumpPath,  userId)).collect(Collectors.toList());

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

        sysNoticeService.insertBatch(collect);

    }



    @Override

    public void simpleNoticeByUser(String title, String message, Long consigneeId,

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

                                    String jumpPath) {

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

        SysNotice sysNotice = convertSysNotice(title, message, consigneeId, jumpPath, userId);

        sysNoticeService.save(sysNotice);

        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, String jumpPath) {

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

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

        List<SysNotice> collect = userMapper.selectList(null).stream().map(it -> convertSysNotice(title, message, it.getUserId(), jumpPath,  userId)).collect(Collectors.toList());

        List<SysNotice> collect = userMapper.selectList(null).stream().map(it -> convertSysNotice(title, message, it.getUserId(),tenantId, jumpPath,  userId)).collect(Collectors.toList());

        sysNoticeService.saveBatch(collect);

    }



@@ -179,7 +179,7 @@


    }



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

    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);//标题

@@ -188,6 +188,7 @@
        sysNotice.setConsigneeId(consigneeId);

        sysNotice.setSenderId(currentUserId);

        sysNotice.setJumpPath(jumpPath);

        sysNotice.setTenantId(tenantId);

        return sysNotice;

    }

}