ruifeng_liu 3 anos atrás
pai
commit
005c452275

+ 2 - 2
app/controller/patent/.patentinfo.js

@@ -71,6 +71,7 @@ module.exports = {
         code: "code",
         status: "status",
         trans_status: "trans_status",
+        user_id: "user_id",
       },
     },
     service: "query",
@@ -83,12 +84,11 @@ module.exports = {
   },
 
   toImport: {
-    requestBody: ["uri", "origin","user_id"],
+    requestBody: ["uri", "origin", "user_id"],
     service: "toImport",
   },
   toExport: {
     requestBody: ["user"],
     service: "toExport",
   },
-  
 };

+ 8 - 5
app/service/patent/patentinfo.js

@@ -50,16 +50,19 @@ class PatentinfoService extends CrudService {
       query.$and = [{ type: { $ne: '发明' } }, { type: { $ne: '实用新型' } }];
       delete query.type;
     }
-    const { code } = query;
+    const { code, user_id } = query;
     let ids = [];
     if (code) {
       const plist = await this.personalModel.find({ code });
       ids = plist.map(i => i._id);
+      if (ids.length > 0) {
+        query.user_id = { $elemMatch: { $in: ids } };
+        delete query.code;
+      }
+    } else if (user_id) {
+      query.user_id = { $elemMatch: { $in: [ user_id ] } };
     }
-    if (ids.length > 0) {
-      query.user_id = { $elemMatch: { $in: ids } };
-      delete query.code;
-    }
+
     return query;
   }