Merge remote-tracking branch 'base-version/test' into dev

This commit is contained in:
chenbowen
2026-01-16 12:51:19 +08:00
2 changed files with 3 additions and 35 deletions

View File

@@ -782,14 +782,11 @@ public class IWorkSyncProcessorImpl implements IWorkSyncProcessor {
if (user == null) {
return null;
}
String workcode = resolveWorkcode(user);
if (StrUtil.isNotBlank(workcode)) {
return workcode;
}
if (StrUtil.isNotBlank(user.getLoginid())) {
return user.getLoginid().trim();
}
return null;
String workcode = resolveWorkcode(user);
return StrUtil.isNotBlank(workcode) ? workcode : null;
}
/**