From 018ee96402f470079b948e07eb26077f40dacd01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=8C=E5=85=88=E8=88=9C?= <2499071264@qq.com>
Date: Thu, 22 Oct 2026 17:50:19 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8F=90=E6=A1=88=E9=85=8D=E7=BD=AE?=
=?UTF-8?q?=E4=B8=8D=E5=AD=98=E5=9C=A8=E3=80=81=E6=A0=A1=E9=A2=86=E5=AF=BC?=
=?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=88=97=E8=A1=A8=E4=B8=BA=20null=20?=
=?UTF-8?q?=E6=88=96=E4=B8=BA=E7=A9=BA=E6=97=B6=EF=BC=8C=E8=AE=B0=E5=BD=95?=
=?UTF-8?q?=E8=AD=A6=E5=91=8A=E5=B9=B6=E8=B7=B3=E8=BF=87=E8=A7=92=E8=89=B2?=
=?UTF-8?q?=E5=88=B7=E6=96=B0=EF=BC=8C=E7=BB=A7=E7=BB=AD=E4=BA=BA=E5=91=98?=
=?UTF-8?q?=E5=85=A8=E9=87=8F=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../services/impl/SysDataUserAllUpdateServiceImpl.java | 8 ++++++--
src/main/resources/application-dev.yaml | 10 +++++-----
src/main/resources/logback.xml | 7 ++++---
3 files changed, 15 insertions(+), 10 deletions(-)
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 406aa62..7522e79 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
@@ -351,8 +351,12 @@ 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 || config.getSchoolLeaderUnitIds() == null || config.getSchoolLeaderUnitIds().isEmpty()) {
+ log.warn("未配置提案校领导单位，跳过校领导角色刷新，继续完成人员全量更新");
+ } else {
+ for (String unitId : config.getSchoolLeaderUnitIds()) {
+ RoleEventPublisher.broadcast(new RoleEventMsg(unitId, RoleConstant.PROPOSAL_BRANCH_SCHOOL_LEADER.name(), RoleEventMsg.RENEW_ROLE));
+ }
}
/*
diff --git a/src/main/resources/application-dev.yaml b/src/main/resources/application-dev.yaml
index 9f2f43d..5f69385 100644
--- a/src/main/resources/application-dev.yaml
+++ b/src/main/resources/application-dev.yaml
@@ -34,11 +34,11 @@ sdk:
appSecret: a65cec4fb69980bd88258fc8433a3eef
redirectUri: /platform/wx/oauth2/callback
cas:
- enable: false
- server-url-prefix: https://i.zjnu.njupt.edu.cn/cas
- server-login-url: https://i.zjnu.njupt.edu.cn/cas/login
- qi-wx-server-login-url: httos:/cas.zjnu.whcp.eou.cn/lyuapServer/wechatauz/wxAuthRedirect
- client-host-url: https://zhgh.zjnu.njupt.edu.cn
+ enable: true
+ server-url-prefix: https://authserver.zjnu.edu.cn/authserver
+ server-login-url: https://authserver.zjnu.edu.cn/authserver/login
+ qi-wx-server-login-url: https://authserver.zjnu.edu.cn/authserver/login
+ client-host-url: https://lxy.zjnu.edu.cn
client-call-back-url: /platform/sso/login
validation-type: cas
minio:
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index ffed0d7..53662f2 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -35,10 +35,11 @@
-
+
-
-
+
+
+