From c62778a0d2fba1255c74073fefbad18e7642783c Mon Sep 17 00:00:00 2001
From: xiaonuobase <1253070437@qq.com>
Date: Fri, 11 Aug 2023 19:08:18 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E4=B8=AD=E5=BF=83=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84?=
 =?UTF-8?q?=E5=9B=BE=E8=B0=83=E6=95=B4=E4=B8=BA=E5=8F=AA=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=9C=AC=E7=BA=A7=E5=8F=8A=E4=BB=A5=E4=B8=8A=EF=BC=8C=E5=90=8C?=
 =?UTF-8?q?=E6=97=B6=E5=8D=87=E7=BA=A7vueTree=E5=89=8D=E7=AB=AF=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 snowy-admin-web/package.json                  |  2 +-
 snowy-admin-web/src/views/sys/role/index.vue  |  6 ++--
 .../sys/user/userTab/organizationChart.vue    | 28 ++++++++-----------
 .../controller/SysUserCenterController.java   |  1 +
 .../user/service/impl/SysUserServiceImpl.java | 11 ++++----
 5 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/snowy-admin-web/package.json b/snowy-admin-web/package.json
index 63a8bc6f..5a3e08cb 100644
--- a/snowy-admin-web/package.json
+++ b/snowy-admin-web/package.json
@@ -54,7 +54,7 @@
 		"vue-i18n": "9.2.2",
 		"vue-router": "4.1.6",
 		"vue3-colorpicker": "2.0.4",
-		"vue3-tree-org": "4.1.1",
+		"vue3-tree-org": "4.2.2",
 		"vuedraggable-es": "4.1.1"
 	},
 	"devDependencies": {
diff --git a/snowy-admin-web/src/views/sys/role/index.vue b/snowy-admin-web/src/views/sys/role/index.vue
index 784968dd..b2952a84 100644
--- a/snowy-admin-web/src/views/sys/role/index.vue
+++ b/snowy-admin-web/src/views/sys/role/index.vue
@@ -75,7 +75,7 @@
 								<template #overlay>
 									<a-menu>
 										<a-menu-item>
-											<a @click="GrantResourceForm.onOpen(record)">授权资源</a>
+											<a @click="grantResourceFormRef.onOpen(record)">授权资源</a>
 										</a-menu-item>
 										<a-menu-item>
 											<a @click="GrantMobileResourceForm.onOpen(record)">授权移动端资源</a>
@@ -95,7 +95,7 @@
 			</a-card>
 		</a-col>
 	</a-row>
-	<grantResourceForm ref="GrantResourceForm" @successful="table.refresh()" />
+	<grantResourceForm ref="grantResourceFormRef" @successful="table.refresh()" />
 	<grantMobileResourceForm ref="GrantMobileResourceForm" @successful="table.refresh()" />
 	<grantPermissionForm ref="GrantPermissionForm" @successful="table.refresh()" />
 	<Form ref="formRef" @successful="table.refresh()" />
@@ -161,7 +161,7 @@
 	// 定义tableDOM
 	const table = ref()
 	const formRef = ref()
-	const GrantResourceForm = ref()
+	const grantResourceFormRef = ref()
 	const GrantMobileResourceForm = ref()
 	const GrantPermissionForm = ref()
 	const userselectorPlusRef = ref()
diff --git a/snowy-admin-web/src/views/sys/user/userTab/organizationChart.vue b/snowy-admin-web/src/views/sys/user/userTab/organizationChart.vue
index a87f03c5..5b514a91 100644
--- a/snowy-admin-web/src/views/sys/user/userTab/organizationChart.vue
+++ b/snowy-admin-web/src/views/sys/user/userTab/organizationChart.vue
@@ -2,9 +2,10 @@
 	<div style="height: 500px">
 		<vue3-tree-org
 			style="background: var(--card-actions-background)"
-			:data="data"
+			:data="treeData"
 			:tool-bar="{ scale: true, restore: false, expand: false, zoom: true, fullscreen: true }"
 			:disabled="false"
+			:center="true"
 			:scalable="true"
 			:draggable-on-node="false"
 			:node-draggable="false"
@@ -18,26 +19,19 @@
 <script setup name="organizationChart">
 	import { Vue3TreeOrg } from 'vue3-tree-org'
 	import 'vue3-tree-org/lib/vue3-tree-org.css'
-	import tool from '@/utils/tool'
-
 	import userCenterApi from '@/api/sys/userCenterApi'
-	let data = ref({})
-	userCenterApi.userLoginOrgTree().then((res) => {
-		const userInfo = tool.data.get('USER_INFO')
-		res = Array.from(res)
-		res.forEach((item) => {
-			if (item.id === userInfo.orgId) {
-				data.value = item
-			}
-		})
+	const treeData = ref({})
+	userCenterApi.userLoginOrgTree().then((data) => {
+		treeData.value = data[0]
 	})
 </script>
 
-<style>
-	.tree-org-node__content {
-		background: var(--body-background) !important;
+<style lang="less" scoped>
+	:deep(tree-org-node__content) {
+		background: var(--body-background);
 	}
-	.tree-org {
-		padding-top: 10px !important;
+	:deep(.tree-org) {
+		padding-top: 10px;
+		padding-left: 10px;
 	}
 </style>
diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserCenterController.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserCenterController.java
index cb6aa3cf..ff710388 100644
--- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserCenterController.java
+++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserCenterController.java
@@ -12,6 +12,7 @@
  */
 package vip.xiaonuo.sys.modular.user.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.lang.tree.Tree;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java
index c9623ea2..e11309be 100644
--- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java
+++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java
@@ -833,15 +833,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     @Override
     public List<Tree<String>> loginOrgTree(SysUserIdParam sysUserIdParam) {
-        List<SysOrg> sysOrgList = sysOrgService.getCachedAllOrgList();
         SysUser sysUser = this.queryEntity(sysUserIdParam.getId());
+        List<SysOrg> originDataList = sysOrgService.getAllOrgList();
+        List<SysOrg> sysOrgList = sysOrgService.getParentListById(originDataList, sysUser.getOrgId(), true);
         List<TreeNode<String>> treeNodeList = sysOrgList.stream().map(sysOrg -> {
             TreeNode<String> treeNode = new TreeNode<>(sysOrg.getId(), sysOrg.getParentId(), sysOrg.getName(), sysOrg.getSortCode());
-            if (ObjectUtil.isNotEmpty(sysUser.getOrgId())) {
-                if (sysOrg.getId().equals(sysUser.getOrgId())) {
-                    treeNode.setExtra(JSONUtil.createObj().set("style", JSONUtil.createObj().set("color", "#FFF")
-                            .set("background", "var(--primary-color)")));
-                }
+            if (sysOrg.getId().equals(sysUser.getOrgId())) {
+                treeNode.setExtra(JSONUtil.createObj().set("style", JSONUtil.createObj().set("color", "#FFF")
+                        .set("background", "var(--primary-color)")));
             }
             return treeNode;
         }).collect(Collectors.toList());