From 8af922853d322be44193923330ce92d59f122271 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期一, 26 十月 2026 09:42:46 +0800
Subject: [PATCH] fix(环保门禁): 地磅新增修改删除临时跳过租户插件(SetOperationList异常)并补tenantId填充注解；远程控制回执去掉模拟执行措辞
---
src/main/java/com/ruoyi/tide/utils/TideUtils.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/tide/utils/TideUtils.java b/src/main/java/com/ruoyi/tide/utils/TideUtils.java
index 10f84ab..dff51f8 100644
--- a/src/main/java/com/ruoyi/tide/utils/TideUtils.java
+++ b/src/main/java/com/ruoyi/tide/utils/TideUtils.java
@@ -142,8 +142,10 @@
.headerMap(header, false)
.body(json.toString())
.execute().body();
+ log.info("[娴疆SSO] appAuthCheck 杩斿洖: {}", body);
JSONObject jsonObject = JSONObject.parseObject(body);
- return jsonObject.get("data").toString();
+ Object data = jsonObject == null ? null : jsonObject.get("data");
+ return data == null ? null : data.toString();
}
// 鑾峰彇鐢ㄦ埛淇℃伅
@@ -157,8 +159,17 @@
.headerMap(header, false)
.body(json.toString())
.execute().body();
+ log.info("[娴疆SSO] getUserInfoByToken 杩斿洖: {}", body);
JSONObject jsonObject = JSONObject.parseObject(body);
- return JSONObject.parseObject(jsonObject.get("data").toString());
+ Object data = jsonObject == null ? null : jsonObject.get("data");
+ if (data == null) {
+ return null;
+ }
+ String dataStr = data.toString();
+ if (dataStr.isEmpty() || "null".equalsIgnoreCase(dataStr)) {
+ return null;
+ }
+ return JSONObject.parseObject(dataStr);
}
public static JSONObject getResult(Integer code, String msg, Object data) {
--
Gitblit v1.9.3