Browse Source

system: 优化用户权限接口

Yi 1 year ago
parent
commit
fbc27a5a3d
1 changed files with 5 additions and 10 deletions
  1. 5 10
      module/backend/system_service.go

+ 5 - 10
module/backend/system_service.go

@@ -262,18 +262,13 @@ func (s *StoreEntry) IsShowSystemUser(ctx context.Context, req *operationPb.IsSh
 // GetSystemUserPermissions 返回系统用户相关菜单权限
 func (s *StoreEntry) GetSystemUserPermissions(ctx context.Context, token string) (*operationPb.SystemUserMenuPermissions, error) {
 	// 解析token
-	/*claims, err := jwt.ParseToken(token)
+	userName, err := s.GetUserName(ctx)
 	if err != nil {
 		return nil, xerr.WithStack(err)
 	}
-
-	if err = claims.Valid(); err != nil {
-		return nil, xerr.WithStack(err)
-	}
-
 	// 根据用户token获取用户数据
-	systemUser := &model.SystemUser{Name: claims.Username}
-	if err = s.DB.Where("name = ?", claims.Username).First(systemUser).Error; err != nil {
+	systemUser := &model.SystemUser{Name: userName}
+	if err = s.DB.Where("name = ?", userName).First(systemUser).Error; err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return nil, xerr.Custom("该用户数据不存在")
 		}
@@ -285,8 +280,8 @@ func (s *StoreEntry) GetSystemUserPermissions(ctx context.Context, token string)
 	systemRoles := make([]*model.SystemRole, 0)
 	if err = s.DB.Where("is_show = ?", operationPb.IsShow_OK).Find(&systemRoles, roleIds).Error; err != nil {
 		return nil, xerr.WithStack(err)
-	}*/
-	systemRoles := make([]*model.SystemRole, 0)
+	}
+
 	systemAllPermissionsList := &SystemAllPermissionsList{
 		PastureList: make([]*model.SystemGroupPasturePermissions, 0),
 		MenuList:    make([]*model.SystemMenuPermissions, 0),