From a75361093040af1f1a54605348abeb6e0c15fa2b Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Sat, 29 Aug 2026 10:32:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E6=94=B9=E7=9F=AD=E4=BF=A1=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=BC=80=E5=90=AF=20=E6=95=B4=E6=94=B9=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E4=BA=BA=E5=91=98=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../budwk/app/base/sms/impl/SmsServiceImpl.java | 2 +- .../impl/SysDataUserAllUpdateServiceImpl.java | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/budwk/app/base/sms/impl/SmsServiceImpl.java b/src/main/java/com/budwk/app/base/sms/impl/SmsServiceImpl.java index a98c539..475245c 100644 --- a/src/main/java/com/budwk/app/base/sms/impl/SmsServiceImpl.java +++ b/src/main/java/com/budwk/app/base/sms/impl/SmsServiceImpl.java @@ -65,7 +65,7 @@ public class SmsServiceImpl implements SmsService { List resultReceivers = buildAndValidateReceivers(sendType, loginNameList, receivers, title, content); List batchResults = new ArrayList<>(); - if (!Globals.MyConfig.getBoolean("SendMsg", false)) { + if (!Globals.MyConfig.getBoolean("AppSms", false)) { String message = "消息发送配置未开启，已跳过实际发送"; log.warn(message); saveSendRecord(sendType, title, content, pcUrl, mobileUrl, resultReceivers.size(), false, diff --git a/src/main/java/com/budwk/app/sys/services/impl/SysDataUserAllUpdateServiceImpl.java b/src/main/java/com/budwk/app/sys/services/impl/SysDataUserAllUpdateServiceImpl.java index 56d6572..b51d08b 100644 --- a/src/main/java/com/budwk/app/sys/services/impl/SysDataUserAllUpdateServiceImpl.java +++ b/src/main/java/com/budwk/app/sys/services/impl/SysDataUserAllUpdateServiceImpl.java @@ -53,9 +53,13 @@ import java.util.stream.Collectors; @IocBean public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService { private static final int BATCH_SIZE = 500; - /** 不需要人工确认。 */ + /** + * 不需要人工确认。 + */ private static final int PENDING_CONFIRM_STATUS_NONE = 0; - /** 数据源缺失，等待人工确认。 */ + /** + * 数据源缺失，等待人工确认。 + */ private static final int PENDING_CONFIRM_STATUS_PENDING = 1; @Inject @@ -353,8 +357,10 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService // 6. 处理其他任务 // 6.1 更新提案的校领导角色，发送订阅 ProposalConfig config = dao.fetch(ProposalConfig.class, Cnd.where("delFlag", "=", false).desc("updatedAt")); - for (String unitId : config.getSchoolLeaderUnitIds()) { - RoleEventPublisher.broadcast(new RoleEventMsg(unitId, RoleConstant.PROPOSAL_BRANCH_SCHOOL_LEADER.name(), RoleEventMsg.RENEW_ROLE)); + if (config != null) { + for (String unitId : config.getSchoolLeaderUnitIds()) { + RoleEventPublisher.broadcast(new RoleEventMsg(unitId, RoleConstant.PROPOSAL_BRANCH_SCHOOL_LEADER.name(), RoleEventMsg.RENEW_ROLE)); + } } /*