From a88d6bdaf4a2126d83e4e0003ed7918a921743a2 Mon Sep 17 00:00:00 2001 From: hongqiwei <1143662660@qq.com> Date: Wed, 2 Sep 2026 17:52:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8E=9F=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=8A=A5=E9=94=99=EF=BC=8C=E7=A6=BB=E6=A0=A1?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E8=B5=8B=E5=80=BC=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/budwk/app/sys/models/Sys_user.java | 1 - .../sys/services/impl/SysDataUserAllUpdateServiceImpl.java | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/budwk/app/sys/models/Sys_user.java b/src/main/java/com/budwk/app/sys/models/Sys_user.java index 0869852..01900d5 100644 --- a/src/main/java/com/budwk/app/sys/models/Sys_user.java +++ b/src/main/java/com/budwk/app/sys/models/Sys_user.java @@ -223,7 +223,6 @@ public class Sys_user extends BaseModel implements Serializable { @Column @Comment("预计离校时间/最后离校时间") @ColDefine(type = ColType.DATE) - @DataCenterColumn(name = "预计离校时间/最后离校时间", key = "LXRQ") private Date expectedLeaveSchoolDate; @Column 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 766a668..8dc0223 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 @@ -508,8 +508,9 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService NutMap change = NutMap.NEW(); change.put("fieldName", "单位"); change.put("field", "unitId"); - change.put("sourceValue", unitIdNameMap.get(user.getUnitId())); - change.put("newValue", unitIdNameMap.get(user.getUnitId())); + // 原单位或新单位可能为空、或暂未同步到单位表，使用空字符串避免生成历史记录时触发空指针。 + change.put("sourceValue", StrUtil.blankToDefault(unitIdNameMap.get(user.getUnitId()), "")); + change.put("newValue", StrUtil.blankToDefault(unitIdNameMap.get(source.getUnitId()), "")); changeList.add(change); // 单位异动发送订阅消息，清空原单位的所有角色