소스 검색

bug:ref解析错误

lrf 2 년 전
부모
커밋
80ccc3302a
2개의 변경된 파일5개의 추가작업 그리고 4개의 파일을 삭제
  1. 3 2
      src/service/BaseService.ts
  2. 2 2
      src/util/getModel.ts

+ 3 - 2
src/service/BaseService.ts

@@ -142,8 +142,9 @@ export abstract class BaseService<T extends AnyParamConstructor<any>> {
     const refs = [];
     for (const key in schema) {
       const f = schema[key];
-      if (_.isObject(f) && _.get(f, 'ref')) {
-        const model = GetModel(key);
+      const ref = _.get(f, 'ref');
+      if (ref) {
+        const model = GetModel(ref);
         const path = key;
         refs.push({ path, model });
       }

+ 2 - 2
src/util/getModel.ts

@@ -9,10 +9,10 @@ export function GetModel(modelName) {
       getClass(_.upperFirst(modelName)) as AnyParamConstructor<any>
     );
   } catch (error) {
-    throw new ServiceError('生成模型错误', FrameworkErrorEnum.SERVICE_FAULT);
+    throw new ServiceError(`${modelName}-生成模型错误`, FrameworkErrorEnum.SERVICE_FAULT);
   }
   if (!model)
-    throw new ServiceError('未找到模型', FrameworkErrorEnum.SERVICE_FAULT);
+    throw new ServiceError(`${modelName}-未找到模型`, FrameworkErrorEnum.SERVICE_FAULT);
 
   return model;
 }