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)); + } } /*