From c23e29efed14182580b0f9a6ced82cfe98f51c07 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 28 Jul 2021 16:38:18 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=9A=E4=B8=8D=E5=AE=9A=E9=98=85?= =?UTF-8?q?=E6=80=BB=E6=98=AF=E8=83=BD=E6=8E=A5=E6=94=B6=E5=88=B0"?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=B6=88=E6=81=AF"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/dataease/service/message/SysMsgService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/backend/src/main/java/io/dataease/service/message/SysMsgService.java b/backend/src/main/java/io/dataease/service/message/SysMsgService.java index 28e25ee900..bf4542347d 100644 --- a/backend/src/main/java/io/dataease/service/message/SysMsgService.java +++ b/backend/src/main/java/io/dataease/service/message/SysMsgService.java @@ -274,10 +274,12 @@ public class SysMsgService { @Cacheable(value = SysMsgConstants.SYS_MSG_USER_SUBSCRIBE, key = "#userId") public List subscribes(Long userId) { SysMsgSettingExample example = new SysMsgSettingExample(); - example.createCriteria().andUserIdEqualTo(userId).andEnableEqualTo(true); + /*example.createCriteria().andUserIdEqualTo(userId).andEnableEqualTo(true);*/ + example.createCriteria().andUserIdEqualTo(userId); List sysMsgSettings = sysMsgSettingMapper.selectByExample(example); // 添加默认订阅 sysMsgSettings = addDefault(sysMsgSettings); + sysMsgSettings = sysMsgSettings.stream().filter(SysMsgSetting::getEnable).collect(Collectors.toList()); // sysMsgSettings.addAll(defaultSettings()); List resultLists = sysMsgSettings.stream().map(item -> { SubscribeNode subscribeNode = new SubscribeNode();