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

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

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

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