Skip to content

Z
zhichan
Commit 71140e02 by 高宇强
Options

gyq

parent 7dda205e
Showing with 96 additions and 161 deletions
igirl-web/app/base/api/impl/cpatentaggregations.js
......@@ -36,21 +36,13 @@ class CPatentAggregationsApi extends ApiBase {
}
}
};
if (obj && obj.length > 0) {
for (var x in obj) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
}
else {
return rtn = {
status: -100,
msg: "参数错误",
data: null,
buckets: null
};
}
var rc = System.getObject("util.execClient");
var rtn = null;
......@@ -98,7 +90,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -149,7 +141,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -198,25 +190,12 @@ class CPatentAggregationsApi extends ApiBase {
}
}
};
if (obj && obj.length > 0) {
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
} else {
return rtn = {
status: -100,
msg: "查询条件为空",
data: null,
buckets: null
};
}
// for (var x in obj) {
// if (obj[x]) {
// params.query.bool.must.push(obj[x]);
// }
// }
var rc = System.getObject("util.execClient");
var rtn = null;
......@@ -264,7 +243,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -315,7 +294,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -366,7 +345,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -417,7 +396,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -468,7 +447,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -519,7 +498,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -572,7 +551,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -625,7 +604,7 @@ class CPatentAggregationsApi extends ApiBase {
obj.push({ "exists": { "field": "gr_no" } });
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -675,21 +654,12 @@ class CPatentAggregationsApi extends ApiBase {
}
}
};
if (obj && obj.length > 0) {
for (var x in obj) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
}
else {
return rtn = {
status: -100,
msg: "参数错误",
data: null,
buckets: null
};
}
var rc = System.getObject("util.execClient");
var rtn = null;
......@@ -738,7 +708,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -788,43 +758,18 @@ class CPatentAggregationsApi extends ApiBase {
}
}
};
// //日志记录
// logCtl.info({
// optitle: "专利关键词聚合聚合ES返回结果--info222",
// op: "/igirl-web/app/base/api/impl/cpatentaggregations.js/KeyWordAggs",
// content: "reqUrl=" + this.patentUrl + "，params.query.bool.must=" +
// JSON.stringify(params.query.bool.must) + "，params.query.bool.must.length=" +
// params.query.bool.must.length + "，obj参数：" + JSON.stringify(obj),
// clientIp: ""
// });
if (obj && obj.length > 0) {
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
}
else {
return rtn = {
status: -100,
msg: "参数错误",
data: null,
buckets: null
};
}
var rc = System.getObject("util.execClient");
var rtn = null;
var requrl = this.patentUrl;
try {
rtn = await rc.execPost(params, requrl);
//日志记录
// logCtl.info({
// optitle: "专利关键词聚合聚合ES返回结果--info",
// op: "/igirl-web/app/base/api/impl/cpatentaggregations.js/KeyWordAggs",
// content: "reqUrl=" + this.patentUrl + "，参数：" + JSON.stringify(params) + "，result：" + rtn.stdout,
// clientIp: ""
// });
var j = JSON.parse(rtn.stdout);
return rtn = {
status: 0,
......@@ -867,7 +812,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -919,7 +864,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -971,7 +916,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -1023,7 +968,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -1075,7 +1020,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -1126,7 +1071,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -1188,7 +1133,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -1239,7 +1184,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -1301,7 +1246,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -1352,7 +1297,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -1414,7 +1359,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -1465,7 +1410,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -1527,7 +1472,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -1590,7 +1535,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -1652,7 +1597,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -1714,7 +1659,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -1767,7 +1712,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -1815,21 +1760,13 @@ class CPatentAggregationsApi extends ApiBase {
}
}
};
if (obj && obj.length > 0) {
for (var x in obj) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
}
else {
return rtn = {
status: -100,
msg: "参数错误",
data: null,
buckets: null
};
}
var rc = System.getObject("util.execClient");
var rtn = null;
......@@ -1887,7 +1824,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -1948,7 +1885,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -2009,7 +1946,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -2070,7 +2007,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -2131,7 +2068,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -2183,7 +2120,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -2236,7 +2173,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -2288,7 +2225,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -2348,7 +2285,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -2419,7 +2356,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -2490,7 +2427,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -2561,7 +2498,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -2632,7 +2569,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -2694,7 +2631,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -2756,7 +2693,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -2818,7 +2755,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -2880,7 +2817,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -2942,7 +2879,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -3004,7 +2941,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -3066,7 +3003,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -3128,7 +3065,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -3190,7 +3127,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -3252,7 +3189,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -3314,7 +3251,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -3365,7 +3302,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -3427,7 +3364,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -3489,7 +3426,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -3551,7 +3488,7 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -3601,10 +3538,11 @@ class CPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
if (type == 2) {
if (areaname == '北京市' || areaname == '天津市' || areaname == '重庆市' || areaname == '上海市') {
params.aggregations.group_by_country.terms.field = "county_name";
......@@ -3639,5 +3577,5 @@ class CPatentAggregationsApi extends ApiBase {
};
}
//----
module.exports = CPatentAggregationsApi;
\ No newline at end of file
igirl-web/app/base/api/impl/wpatentaggregations.js
......@@ -32,7 +32,7 @@ class WPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -83,7 +83,7 @@ class WPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -134,7 +134,7 @@ class WPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -185,7 +185,7 @@ class WPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -236,7 +236,7 @@ class WPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -297,7 +297,7 @@ class WPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -369,7 +369,7 @@ class WPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -441,7 +441,7 @@ class WPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -502,7 +502,7 @@ class WPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -574,7 +574,7 @@ class WPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -646,7 +646,7 @@ class WPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -707,7 +707,7 @@ class WPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -779,7 +779,7 @@ class WPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -851,7 +851,7 @@ class WPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -912,7 +912,7 @@ class WPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -984,7 +984,7 @@ class WPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -1056,7 +1056,7 @@ class WPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -1118,7 +1118,7 @@ class WPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -1169,7 +1169,7 @@ class WPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -1240,7 +1240,7 @@ class WPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -1301,7 +1301,7 @@ class WPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -1362,7 +1362,7 @@ class WPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -1423,7 +1423,7 @@ class WPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -1494,7 +1494,7 @@ class WPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -1565,7 +1565,7 @@ class WPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -1636,7 +1636,7 @@ class WPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -1707,7 +1707,7 @@ class WPatentAggregationsApi extends ApiBase {
};
for (var x in obj) {
if (obj[x]) {
if (obj[x] && obj[x] != "undefined" && obj[x] != "null") {
params.query.bool.must.push(obj[x]);
}
}
......@@ -1734,8 +1734,5 @@ class WPatentAggregationsApi extends ApiBase {
}
};
}
module.exports = WPatentAggregationsApi;
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment