diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java index 150479f..0e74254 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java @@ -51,6 +51,7 @@ import org.springblade.core.tool.utils.StringUtil; import org.springblade.system.entity.Dept; import org.springblade.system.user.cache.UserCache; import org.springblade.system.user.entity.User; +import org.springblade.system.user.feign.IUserClient; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; @@ -111,6 +112,8 @@ public class HydropowerServiceImpl implements HydropowerService { private final IInspectTaskReportClient inspectTaskReportClient; + private final IUserClient userClient; + private final RedisTemplate redisTemplate; @Value("${hzims.operation.realIdKey}") @@ -1866,11 +1869,11 @@ public class HydropowerServiceImpl implements HydropowerService { if(StringUtil.isBlank(managerId)){ return ""; } - User user = UserCache.getUser(Long.valueOf(managerId)); - if (ObjectUtil.isEmpty(user)) { + R userR = userClient.userInfoById(Long.valueOf(managerId)); + if(!userR.isSuccess() || ObjectUtil.isEmpty(userR.getData())){ return ""; } - return user.getName(); + return userR.getData().getName(); } /** @@ -1882,11 +1885,11 @@ public class HydropowerServiceImpl implements HydropowerService { if(StringUtil.isBlank(managerId)){ return ""; } - User user = UserCache.getUser(Long.valueOf(managerId)); - if (ObjectUtil.isEmpty(user)) { + R userR = userClient.userInfoById(Long.valueOf(managerId)); + if(!userR.isSuccess() || ObjectUtil.isEmpty(userR.getData())){ return ""; } - return user.getPhone(); + return userR.getData().getPhone(); } /**