Commit 19706925 authored by qinhaitao's avatar qinhaitao

fix: 🐛 paramscheck

parent 3bd3d696
...@@ -59,15 +59,16 @@ exports.paramsCheck = function (params) { ...@@ -59,15 +59,16 @@ exports.paramsCheck = function (params) {
return function (target, name, descriptor) { return function (target, name, descriptor) {
var method = descriptor.value; var method = descriptor.value;
descriptor.value = function () { descriptor.value = function () {
var _a;
var args = []; var args = [];
for (var _i = 0; _i < arguments.length; _i++) { for (var _i = 0; _i < arguments.length; _i++) {
args[_i] = arguments[_i]; args[_i] = arguments[_i];
} }
var context = args[0], _a = args[1], otherArgs = _a === void 0 ? {} : _a; var context = args[0], _b = args[1], otherArgs = _b === void 0 ? {} : _b;
var dataKeys = Object.keys(context.data); var dataKeys = Object.keys(context.data);
for (var i = 0; i < params.length; i++) { for (var i = 0; i < params.length; i++) {
var param = params[i]; var param = params[i];
if (!dataKeys.includes(param)) if (!dataKeys.includes(param) || ((_a = context.data) === null || _a === void 0 ? void 0 : _a[param]) === '')
return sdk_1.resultsModel.error(constants_1.CODE_TYPES.PARAMS_ERROR, "\u7F3A\u5C11" + param + "\u53C2\u6570"); return sdk_1.resultsModel.error(constants_1.CODE_TYPES.PARAMS_ERROR, "\u7F3A\u5C11" + param + "\u53C2\u6570");
} }
return method.apply(target, [context, __assign({}, otherArgs)]); return method.apply(target, [context, __assign({}, otherArgs)]);
......
{"version":3,"file":"check.js","sourceRoot":"","sources":["../../src/decorator/check.ts"],"names":[],"mappings":"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"} {"version":3,"file":"check.js","sourceRoot":"","sources":["../../src/decorator/check.ts"],"names":[],"mappings":"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"}
\ No newline at end of file \ No newline at end of file
...@@ -15,7 +15,8 @@ export const paramsCheck = (params: string[]) => { ...@@ -15,7 +15,8 @@ export const paramsCheck = (params: string[]) => {
const dataKeys = Object.keys(context.data) const dataKeys = Object.keys(context.data)
for (let i = 0; i < params.length; i++) { for (let i = 0; i < params.length; i++) {
const param = params[i] const param = params[i]
if (!dataKeys.includes(param)) return resultsModel.error(CODE_TYPES.PARAMS_ERROR, `缺少${param}参数`) if (!dataKeys.includes(param) || context.data?.[param] === '')
return resultsModel.error(CODE_TYPES.PARAMS_ERROR, `缺少${param}参数`)
} }
return method.apply(target, [context, { ...otherArgs }]) return method.apply(target, [context, { ...otherArgs }])
} }
......
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