From 5839384228e2f10d880d23c7a1c99ba86430634c Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期三, 24 五月 2023 14:59:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
product-server-admin/src/main/java/com/product/admin/service/LoginInitParameterService.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/product-server-admin/src/main/java/com/product/admin/service/LoginInitParameterService.java b/product-server-admin/src/main/java/com/product/admin/service/LoginInitParameterService.java
index 41c50f4..aaceea5 100644
--- a/product-server-admin/src/main/java/com/product/admin/service/LoginInitParameterService.java
+++ b/product-server-admin/src/main/java/com/product/admin/service/LoginInitParameterService.java
@@ -104,7 +104,8 @@
if (user.getCurrentDept() != null) {
ui.put("dept_name", user.getCurrentDept().getString("org_level_name"));
ui.put("dept_uuid", user.getCurrentDept().getString("uuid"));
- ui.put("dept_all_name", user.getCurrentDept().getString("org_level_all"));
+ String dept_all=user.getCurrentDept().getString("org_level_all");
+ ui.put("dept_all_name", dept_all.substring(dept_all.indexOf(user.getOrg_level_name())));
ui.put("dept_code", user.getCurrentDept().getString("org_level_code"));
}
ui.put("user_signature", RedisUtil.get(userOperaService.USER_SIGNATURE_KEY + user.getUser_id()));
--
Gitblit v1.9.2