From c5f6f451fcd2a5257315590c5a256766fa68e433 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Mon, 19 Aug 2024 14:02:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/service/BladeUserDetailsServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/service/BladeUserDetailsServiceImpl.java b/skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/service/BladeUserDetailsServiceImpl.java
index 9ddd652..3b0978b 100644
--- a/skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/service/BladeUserDetailsServiceImpl.java
+++ b/skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/service/BladeUserDetailsServiceImpl.java
@@ -160,11 +160,11 @@
}
//拼接用户所属行政区划、责任人需要返回水库ids
- userInfo.getDetail().set("resIds","");
- if (StringUtil.isNotBlank(user.getPhone())) {
- R<AttResManagePerson> attRes = attResManagePersonClient.queryListByPhone(user.getPhone());
- userInfo.getDetail().set("resIds",attRes.getData());
- }
+// userInfo.getDetail().set("resIds","");
+// if (StringUtil.isNotBlank(user.getPhone())) {
+// R<AttResManagePerson> attRes = attResManagePersonClient.queryListByPhone(user.getPhone());
+// userInfo.getDetail().set("resIds",attRes.getData());
+// }
//返回手机号
userInfo.getDetail().set("phone",Base64Utils.getBase64Encode(user.getPhone()));
--
Gitblit v1.9.3