更新原单位为空报错,离校日期赋值不对

This commit is contained in:
2026-09-02 17:52:14 +08:00
parent 853131297e
commit a88d6bdaf4
2 changed files with 3 additions and 3 deletions
@@ -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
@@ -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);
// 单位异动发送订阅消息,清空原单位的所有角色