lrf402788946 4 years ago
parent
commit
54ad1060bb
2 changed files with 4 additions and 5 deletions
  1. 3 3
      app/middleware/disclosure_report.js
  2. 1 2
      app/service/patent/report.js

+ 3 - 3
app/middleware/disclosure_report.js

@@ -25,12 +25,12 @@ module.exports = options => {
         const res = await checkReport(ctx, ids);
         const res = await checkReport(ctx, ids);
         if (_.isArray(data)) {
         if (_.isArray(data)) {
           for (const i of data) {
           for (const i of data) {
-            const r = res.find(f => ObjectId(f).equals(i._id));
-            if (r) i.has_report = true;
+            const r = res.find(f => ObjectId(f.disclosure_id).equals(i._id));
+            if (r) i.has_report = r._id;
             else i.has_report = false;
             else i.has_report = false;
           }
           }
         } else {
         } else {
-          if (res.length > 0) data.has_report = true;
+          if (res.length > 0) data.has_report = res[0]._id;
           else data.has_report = false;
           else data.has_report = false;
         }
         }
         ctx.body.data = data;
         ctx.body.data = data;

+ 1 - 2
app/service/patent/report.js

@@ -14,8 +14,7 @@ class ReportService extends CrudService {
 
 
   async checkReport(ids) {
   async checkReport(ids) {
     ids = ids.map(i => ObjectId(i));
     ids = ids.map(i => ObjectId(i));
-    let list = await this.model.find({ disclosure_id: { $in: ids } }, { disclosure_id: 1 });
-    list = list.map(i => i.disclosure_id);
+    const list = await this.model.find({ disclosure_id: { $in: ids } }, { disclosure_id: 1 });
     return list;
     return list;
   }
   }
 }
 }