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(); } - R> users = userClient.userListByCodeAndNameAndAccount(AuthUtil.getTenantId(),content.getUserCode(),content.getUserName(),content.getLoginName()); - if(!users.isSuccess() || CollectionUtil.isEmpty(users.getData())){ - return new ArrayList<>(); - } - Map userMap = users.getData().stream().collect(Collectors.toMap(User::getId, Function.identity())); +// R> users = userClient.userListByCodeAndNameAndAccount(AuthUtil.getTenantId(),content.getUserCode(),content.getUserName(),content.getLoginName()); +// if(!users.isSuccess() || CollectionUtil.isEmpty(users.getData())){ +// return new ArrayList<>(); +// } +// Map 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 Func.isNotEmpty(o.getUserId())).collect(Collectors.toList()); } }