diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/PigxDefaultDataScopeHandle.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/PigxDefaultDataScopeHandle.java
index 2dc1677d8..bc0ef713e 100644
--- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/PigxDefaultDataScopeHandle.java
+++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/PigxDefaultDataScopeHandle.java
@@ -22,13 +22,11 @@ import cn.hutool.core.util.StrUtil;
 import com.pig4cloud.pigx.admin.api.entity.SysDept;
 import com.pig4cloud.pigx.admin.api.entity.SysRole;
 import com.pig4cloud.pigx.admin.api.feign.RemoteDataScopeService;
-import com.pig4cloud.pigx.common.core.constant.SecurityConstants;
 import com.pig4cloud.pigx.common.core.constant.enums.UserTypeEnum;
 import com.pig4cloud.pigx.common.core.util.RetOps;
 import com.pig4cloud.pigx.common.security.service.PigxUser;
 import com.pig4cloud.pigx.common.security.util.SecurityUtils;
 import lombok.RequiredArgsConstructor;
-import org.springframework.security.core.GrantedAuthority;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -68,11 +66,7 @@ public class PigxDefaultDataScopeHandle implements DataScopeHandle {
         }
 
         // 获取用户角色ID列表
-        List<String> roleIdList = user.getAuthorities().stream()
-                .map(GrantedAuthority::getAuthority)
-                .filter(authority -> authority.startsWith(SecurityConstants.ROLE))
-                .map(authority -> authority.split(StrUtil.UNDERLINE)[1])
-                .collect(Collectors.toList());
+        List<Long> roleIdList = user.getRoleIds();
         if (CollUtil.isEmpty(roleIdList)) {
             return false;
         }
diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteDataScopeService.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteDataScopeService.java
index a0ea18338..f99fc2981 100644
--- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteDataScopeService.java
+++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteDataScopeService.java
@@ -44,7 +44,7 @@ public interface RemoteDataScopeService {
 	 * @return
 	 */
 	@PostMapping("/role/getRoleList")
-	R<List<SysRole>> getRoleList(@RequestBody List<String> roleIdList);
+	R<List<SysRole>> getRoleList(@RequestBody List<Long> roleIdList);
 
 	/**
 	 * 获取子级部门