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); // 单位异动发送订阅消息,清空原单位的所有角色