zgty/zt-dsc
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into test

Browse Source
This commit is contained in:
chenbowen
2026-01-16 12:51:36 +08:00
parent a3386853fa d3a771a8a8
commit 4bcce5046c
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/integration/iwork/impl/IWorkSyncProcessorImpl.java
View File

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