From 3a8252e81d9372fa54399d7b0d7919f97d88f07f Mon Sep 17 00:00:00 2001 From: feng <18691763612@163.com> Date: Thu, 22 Jan 2026 13:35:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E7=9C=BC=E5=B9=B3=E5=8F=B0=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/renkang/anyan/config/RestTemplateUtil.java | 2 +- .../modules/system/service/impl/LoginAnYanServiceImpl.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/config/RestTemplateUtil.java b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/config/RestTemplateUtil.java index 0aad30c..0e58597 100644 --- a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/config/RestTemplateUtil.java +++ b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/config/RestTemplateUtil.java @@ -125,7 +125,7 @@ public class RestTemplateUtil { if (HttpStatus.OK.equals(entity.getStatusCode()) && ObjectUtils.isNotEmpty(entity.getBody())) { return entity.getBody(); } else { - return AnYanResult.error("天眼系统API调用失败"); + return AnYanResult.error("外部平台API调用失败"); } } diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/LoginAnYanServiceImpl.java b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/LoginAnYanServiceImpl.java index 67d5b12..672d98e 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/LoginAnYanServiceImpl.java +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/LoginAnYanServiceImpl.java @@ -116,10 +116,10 @@ public class LoginAnYanServiceImpl implements ILoginAnYanService { return Result.error(anYanAuthResult != null ? anYanAuthResult.getMessage() : "认证服务器无响应"); } - // 授权成功获取用户信息 + // 授权成功获取用户信息(统一认证的平台接口没有做统一封装,成功和失败均返回一个不同的json字符串, 这里只能判断没有获取到用户信息则认为是失败) AnYanUserInfoResult anYanUserInfo = anYanClient.getAnYanUserInfo(anYanAuthResult.getAccess_token()); - if (anYanUserInfo == null) { - return Result.error("无法获取用户信息"); + if (anYanUserInfo == null || anYanUserInfo.getEmployeeUnitDTO() == null) { + return Result.error("登录失败，请先联系本单位掌油管理员确认个人机构信息"); } // 检查并更新用户信息