|
@@ -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;
|
|
|
}
|
|
|
|