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 18:19:49 +08:00
parent 7541cb4d6f e6ec4f9e23
commit d4f26b5244
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,6 @@ import org.springframework.stereotype.Service;
import org.springframework.util.DigestUtils; import org.springframework.util.DigestUtils;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.Locale;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
@@ -786,7 +785,7 @@ public class IWorkSyncProcessorImpl implements IWorkSyncProcessor {
return user.getLoginid().trim(); return user.getLoginid().trim();
} }
// loginid 为空也继续同步，username 设为空字符串，不再回退工号 // loginid 为空也继续同步，username 设为空字符串，不再回退工号
return ""; return " ";
} }
/** /**

3
zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/user/AdminUserServiceImpl.java
View File

@@ -190,7 +190,8 @@ public class AdminUserServiceImpl implements AdminUserService {
// 2.1 只更新非空字段 // 2.1 只更新非空字段
AdminUserDO updateObj = new AdminUserDO(); AdminUserDO updateObj = new AdminUserDO();
updateObj.setId(updateReqVO.getId()); updateObj.setId(updateReqVO.getId());
if (StrUtil.isNotBlank(updateReqVO.getUsername())) { // iwork 同步时，存在用户名为空的情况，因此改为 isNotEmpty 判断
if (StrUtil.isNotEmpty(updateReqVO.getUsername())) {
updateObj.setUsername(updateReqVO.getUsername()); updateObj.setUsername(updateReqVO.getUsername());
} }
if (StrUtil.isNotBlank(updateReqVO.getNickname())) { if (StrUtil.isNotBlank(updateReqVO.getNickname())) {