|
@@ -5,10 +5,6 @@ const findUserByCode = async (ctx, code) => {
|
|
|
const { code: qcode } = ctx.query;
|
|
|
const http = ctx.service.util.httpUtil;
|
|
|
const basePrefix = ctx.app.config.httpPrefix.base;
|
|
|
- console.log('code ? code : qcode');
|
|
|
- console.log(code);
|
|
|
- console.log(qcode);
|
|
|
- console.log(code ? code : qcode);
|
|
|
const res = await http.cget(`${basePrefix}/personal`, { code: code ? code : qcode });
|
|
|
if (res) return res;
|
|
|
};
|
|
@@ -56,14 +52,19 @@ module.exports = options => {
|
|
|
return async function patentQuery(ctx, next) {
|
|
|
console.log('function in patentquery middleware');
|
|
|
const query = ctx.query;
|
|
|
- const { code, role } = query;
|
|
|
+ const { code, role, user_id } = query;
|
|
|
if (code && role) {
|
|
|
let res;
|
|
|
- if (role === '1') res = await role1Search(ctx);
|
|
|
- else res = await role2Search(ctx);
|
|
|
- delete ctx.query.code;
|
|
|
- delete ctx.query.role;
|
|
|
- ctx.query.user_id = { $elemMatch: { user_id: { $in: res } } };
|
|
|
+ if (role) {
|
|
|
+ if (role === '1') res = await role1Search(ctx);
|
|
|
+ else if (role === '2') res = await role2Search(ctx);
|
|
|
+ delete ctx.query.code;
|
|
|
+ delete ctx.query.role;
|
|
|
+ ctx.query.user_id = { $elemMatch: { user_id: { $in: res } } };
|
|
|
+ } else if (user_id) {
|
|
|
+ ctx.query.user_id = { $elemMatch: { user_id: { $in: [ user_id ] } } };
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
await next();
|
|
|
};
|