From f2d0713c2b20a6c751399e2468996eafb8812988 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Thu, 18 Apr 2024 10:37:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/service/BladeUserDetailsServiceImpl.java | 24 +++++++++++++++++++-----
1 files changed, 19 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 a79e260..9ddd652 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
@@ -170,11 +170,19 @@
userInfo.getDetail().set("phone",Base64Utils.getBase64Encode(user.getPhone()));
String deptStr = "";
- if (userInfo.getUser().getDeptId().indexOf(",") > 0){
- deptStr = userInfo.getUser().getDeptId().split(",")[0];
+
+ String deptIds = userInfo.getUser().getDeptId();
+ if (deptIds.indexOf(",") > 0){
+ deptStr = deptIds.split(",")[0];
}else {
- deptStr = userInfo.getUser().getDeptId();
+ deptStr = deptIds;
}
+
+ String resDeptIds = "";
+
+ resDeptIds = sysClient.getResDept(deptIds);
+ userInfo.getDetail().set("resDeptIds",resDeptIds);
+
R<Dept> deptRes = sysClient.getDept(Long.valueOf(deptStr));
if (StringUtil.isBlank(deptRes.getData().getAdCode())) {
// 部门为空
@@ -182,10 +190,16 @@
userInfo.getDetail().set("adCodeBase", "");
userInfo.getDetail().set("parentDept",0);
} else {
- userInfo.getDetail().set("adCodeBase",attResManagePersonClient.getAdBaseById(deptRes.getData().getAdCode()).getData());
+ //根据用户标识类型判断是水库还是堤防
+ if (user.getType().equals("堤防")){
+ //堤防需要从自己的库中获取行政区划
+ userInfo.getDetail().set("adCodeBase",attResManagePersonClient.getYwxtAdBaseById(deptRes.getData().getAdCode()).getData());
+ }else{
+ //水库从中台表中获取行政区划
+ userInfo.getDetail().set("adCodeBase",attResManagePersonClient.getAdBaseById(deptRes.getData().getAdCode()).getData());
+ }
userInfo.getDetail().set("parentDept",deptRes.getData().getParentId());
}
-
String collectResIds = collectClient.getMyCollect(user.getId().toString());
userInfo.getDetail().set("collect",collectResIds);
--
Gitblit v1.9.3