From 53774b63325d44296871091b1b5ab3d3ba94e6c4 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Mon, 8 May 2023 10:01:19 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E2=9C=A8=20feat(db):=20=E8=A1=A5?=
 =?UTF-8?q?=E5=85=85Role=E8=A1=A8=E4=B8=AD=E5=8F=AA=E8=AF=BB=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E4=BD=BF=E7=94=A8"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1fba24b4a00342e48b95ff4e9f82e05913cfd15a.
---
 shared/db/Role.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/shared/db/Role.ts b/shared/db/Role.ts
index 95f26aea6..9e91ead9e 100644
--- a/shared/db/Role.ts
+++ b/shared/db/Role.ts
@@ -378,7 +378,7 @@ export default class Role extends BaseModel {
     }
 
     public static async findByUid(uid: number, serverId: number, select?: string, getters = false) {
-        const role: RoleType = await RoleROModel.findOne({ 'userInfo.uid': uid, serverId }).select(select).lean({ getters, virtuals: true });
+        const role: RoleType = await RoleModel.findOne({ 'userInfo.uid': uid, serverId }).select(select).lean({ getters, virtuals: true });
 
         return role;
     }
@@ -396,7 +396,7 @@ export default class Role extends BaseModel {
      * @param getters 是否使用get方法，如ce使用了自动缩小1w倍
      */
     public static async findByRoleId(roleId: string, select?: string, getters = false, virtuals = true) {
-        const role: RoleType = await RoleROModel.findOne({ roleId }).select(select).lean({ getters, virtuals });
+        const role: RoleType = await RoleModel.findOne({ roleId }).select(select).lean({ getters, virtuals });
         return role;
     }
     public static async findByRoleIds(roleIds: string[], select?: string, getters = false, virtuals = true) {
@@ -405,7 +405,7 @@ export default class Role extends BaseModel {
     }
 
     public static async findByRoleName(roleName: string, select?: string, getters = false, virtuals = true) {
-        const role: RoleType = await RoleROModel.findOne({ roleName }).select(select).lean({ getters, virtuals });
+        const role: RoleType = await RoleModel.findOne({ roleName }).select(select).lean({ getters, virtuals });
         return role;
     }
 
@@ -516,7 +516,7 @@ export default class Role extends BaseModel {
     public static async hangUpSpdUp(roleId: string, cnt: number, curTime: Date) {
         if (cnt < 0) return null;
 
-        const result = await RoleROModel.findOne({ roleId }).lean();
+        const result = await RoleModel.findOne({ roleId }).lean();
         const lastSpdUpTime = result?.lastSpdUpTime;
         let role: RoleType;
         if(!lastSpdUpTime || shouldRefresh(lastSpdUpTime, curTime)) {