From 8c80d96ab46df55ad668157dae9fe082b7aa5bb5 Mon Sep 17 00:00:00 2001
From: haungxing <1203316822@qq.com>
Date: Wed, 31 Jul 2024 08:45:36 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=B7=A1=E6=A3=80=E5=AF=B9?=
 =?UTF-8?q?=E8=B1=A1=E4=BA=BA=E5=91=98=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E5=90=8D=E7=A7=B0=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../obj/services/impl/ObjectUserServiceImpl.java        | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ObjectUserServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ObjectUserServiceImpl.java
index e51682b..6ffe9ac 100644
--- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ObjectUserServiceImpl.java
+++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ObjectUserServiceImpl.java
@@ -11,7 +11,9 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.utils.CollectionUtil;
+import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.system.user.cache.UserCache;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.stereotype.Service;
@@ -53,11 +55,11 @@ public class ObjectUserServiceImpl extends ServiceImpl<ObjectUserMapper, ObjectU
         if(objectUsers.isEmpty()){
             return new ArrayList<>();
         }
-        R<List<User>> users = userClient.userListByCodeAndNameAndAccount(AuthUtil.getTenantId(),content.getUserCode(),content.getUserName(),content.getLoginName());
-        if(!users.isSuccess() || CollectionUtil.isEmpty(users.getData())){
-            return new ArrayList<>();
-        }
-        Map<Long,User> userMap = users.getData().stream().collect(Collectors.toMap(User::getId, Function.identity()));
+//        R<List<User>> users = userClient.userListByCodeAndNameAndAccount(AuthUtil.getTenantId(),content.getUserCode(),content.getUserName(),content.getLoginName());
+//        if(!users.isSuccess() || CollectionUtil.isEmpty(users.getData())){
+//            return new ArrayList<>();
+//        }
+//        Map<Long,User> userMap = users.getData().stream().collect(Collectors.toMap(User::getId, Function.identity()));
         return objectUsers.stream().map(objectUser->{
             ObjectUserListVO builder = new ObjectUserListVO();
             builder.setId(objectUser.getId());
@@ -65,7 +67,8 @@ public class ObjectUserServiceImpl extends ServiceImpl<ObjectUserMapper, ObjectU
             builder.setObjName(objectUser.getObjName());
             builder.setTempCode(objectUser.getTempCode());
             builder.setTempName(objectUser.getTempName());
-            User user = userMap.get(objectUser.getUserId());
+//            User user = userMap.get(objectUser.getUserId());
+            User user = UserCache.getUser(objectUser.getUserId());
             if(ObjectUtil.isNotEmpty(user)){
                 builder.setUserCode(user.getCode());
                 builder.setUserName(user.getRealName());
@@ -73,6 +76,6 @@ public class ObjectUserServiceImpl extends ServiceImpl<ObjectUserMapper, ObjectU
                 builder.setUserId(user.getId());
             }
             return builder;
-        }).collect(Collectors.toList());
+        }).filter(o -> Func.isNotEmpty(o.getUserId())).collect(Collectors.toList());
     }
 }