From 2696a626c34a477ce50273234715cf4ea04ac491 Mon Sep 17 00:00:00 2001
From: xiaonuobase <1253070437@qq.com>
Date: Thu, 8 Dec 2022 17:28:18 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E4=B8=A4=E4=B8=AA=E9=97=AE=E9=A2=98=EF=BC=8C=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E7=9A=84issues=E4=B8=BA=EF=BC=88=E5=B0=91=E6=9E=97?=
 =?UTF-8?q?=E5=AF=BA=E9=A9=BB=E5=8C=97=E5=9B=BA=E5=B1=B1=E5=8A=9E=E4=BA=8B?=
 =?UTF-8?q?=E5=A4=84=E5=A4=A7=E7=A5=9E=E7=88=B6=E7=8E=8B=E5=96=87=E5=98=9B?=
 =?UTF-8?q?=EF=BC=89=E5=88=9B=E5=BB=BA=20#I6546J=E3=80=81=EF=BC=88?=
 =?UTF-8?q?=E5=8F=AF=E8=BE=BE=E9=B8=AD=E7=BB=99=E6=88=91=E5=86=B2=E9=B8=AD?=
 =?UTF-8?q?=EF=BC=89=E5=88=9B=E5=BB=BA=20#I631O1=EF=BC=8C=E6=8F=90?=
 =?UTF-8?q?=E5=87=BA=E8=B4=A1=E7=8C=AE=E6=84=9F=E8=B0=A2=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 snowy-admin-web/src/views/sys/role/scopeDefineOrg.vue           | 2 +-
 .../auth/modular/login/service/impl/AuthServiceImpl.java        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/snowy-admin-web/src/views/sys/role/scopeDefineOrg.vue b/snowy-admin-web/src/views/sys/role/scopeDefineOrg.vue
index 1812f983..256a2e1b 100644
--- a/snowy-admin-web/src/views/sys/role/scopeDefineOrg.vue
+++ b/snowy-admin-web/src/views/sys/role/scopeDefineOrg.vue
@@ -33,7 +33,7 @@
 	const resultDataModel = {
 		dataScopeId: '',
 		defineOrgIdData: {
-			scopeCategory: 'SCOPE_DEFINE_ORG',
+			scopeCategory: 'SCOPE_ORG_DEFINE',
 			scopeDefineOrgIdList: []
 		}
 	}
diff --git a/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/service/impl/AuthServiceImpl.java b/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/service/impl/AuthServiceImpl.java
index c41be25f..7ac27587 100644
--- a/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/service/impl/AuthServiceImpl.java
+++ b/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/service/impl/AuthServiceImpl.java
@@ -315,7 +315,7 @@ public class AuthServiceImpl implements AuthService {
         saBaseClientLoginUser.setButtonCodeList(clientLoginUserApi.getButtonCodeListListByUserId(saBaseClientLoginUser.getId()));
         // 获取数据范围
         saBaseClientLoginUser.setDataScopeList(Convert.toList(SaBaseClientLoginUser.DataScope.class,
-                loginUserApi.getPermissionListByUserId(saBaseClientLoginUser.getId(), null)));
+                clientLoginUserApi.getPermissionListByUserId(saBaseClientLoginUser.getId(), null)));
         // 获取权限码
         saBaseClientLoginUser.setPermissionCodeList(saBaseClientLoginUser.getDataScopeList().stream()
                 .map(SaBaseClientLoginUser.DataScope::getApiUrl).collect(Collectors.toList()));