From 643b0c7a8ea41fe07a3d52fc60d25de1d2bfa3ef Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Mon, 8 May 2023 09:58:25 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E2=9C=A8=20feat(db):=20item=E8=A1=A8?=
 =?UTF-8?q?=E5=86=85=E6=9F=A5=E8=AF=A2=E6=93=8D=E4=BD=9C=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E5=8F=AA=E8=AF=BB=E8=8A=82=E7=82=B9"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0f46c039303b8f21d8f1e7ba79d929270dde0bab.
---
 shared/db/Item.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/shared/db/Item.ts b/shared/db/Item.ts
index a7e8d840b..34135ff5c 100644
--- a/shared/db/Item.ts
+++ b/shared/db/Item.ts
@@ -24,27 +24,27 @@ export default class Item extends BaseModel {
 
 
     public static async findbyRole(roleId: string, select = '') {
-        const items: ItemType[] = await ItemROModel.find({ roleId, count: {$gte: 0} }).select(select).lean();
+        const items: ItemType[] = await ItemModel.find({ roleId, count: {$gte: 0} }).select(select).lean();
         return items;
     }
 
     public static async findbyRoleAndIds(roleId: string, ids: Array<number>, lean = true) {
-        const items: ItemType[] = await ItemROModel.find({ roleId, id: { $in: ids }, count: {$gte: 0} }).select('id count type').lean(lean);
+        const items: ItemType[] = await ItemModel.find({ roleId, id: { $in: ids }, count: {$gte: 0} }).select('id count type').lean(lean);
         return items;
     }
 
     public static async findByRoleAndType(roleId: string, type: number, lean = true) {
-        const items: ItemType[] = await ItemROModel.find({ roleId, type }).select('id count type').sort({ id: 1 }).lean(lean);
+        const items: ItemType[] = await ItemModel.find({ roleId, type }).select('id count type').sort({ id: 1 }).lean(lean);
         return items;
     }
 
     public static async findbyRoleAndGidAndCount(roleId: string, id: number, count: number, lean = true) {
-        const items: ItemType = await ItemROModel.findOne({ roleId, id, count: { $gte: count } }).select('id count type').lean(lean);
+        const items: ItemType = await ItemModel.findOne({ roleId, id, count: { $gte: count } }).select('id count type').lean(lean);
         return items;
     }
 
     public static async findbyRoleAndGid(roleId: string, id: number, lean = true) {
-        const items: ItemType = await ItemROModel.findOne({ roleId, id }).select('id count type').lean(lean);
+        const items: ItemType = await ItemModel.findOne({ roleId, id }).select('id count type').lean(lean);
         return items;
     }
 
@@ -125,7 +125,7 @@ export default class Item extends BaseModel {
                 sort[sortField] = -1;
             }
         }
-        const result: ItemType[] = await ItemROModel.find(searchObj).limit(pageSize).skip((page - 1) * pageSize).sort(sort).select('-_id -__v -createdAt -updatedAt').lean({ getters: true, virtuals: true });
+        const result: ItemType[] = await ItemModel.find(searchObj).limit(pageSize).skip((page - 1) * pageSize).sort(sort).select('-_id -__v -createdAt -updatedAt').lean({ getters: true, virtuals: true });
         return result;
 
     }
@@ -133,7 +133,7 @@ export default class Item extends BaseModel {
     public static async countByCondition(form: SearchItemParam = {}) {
 
         let searchObj = this.getSearchObj(form);
-        const result = await ItemROModel.count(searchObj);
+        const result = await ItemModel.count(searchObj);
         return result;
     }
 }