Merge branch 'dev' into test

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

@@ -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;
     }
 
     /**