Commit ab8ba502 by zhaoxiqing

gsb

parent 65ea3769
...@@ -257,23 +257,12 @@ class YZContractApi { ...@@ -257,23 +257,12 @@ class YZContractApi {
async sinedMerchant3rd(obj, req) { async sinedMerchant3rd(obj, req) {
// 验证合法性 // 验证合法性
var appId = obj.appId;
var nonceStr = obj.nonceStr; var nonceStr = obj.nonceStr;
var idNo = obj.idNo || ""; var idNo = obj.idNo || "";
var startId = obj.startId || 0; var startId = obj.startId || 0;
var merchantId = obj.merchantId || ""; var merchantId = obj.merchantId || "";
var pageSize = 20; var pageSize = 20;
// var busi = await this.ecompanybusiSve.findOne({
// appId: appId
// });
// if (!busi) {
// return {
// code: 1001003,
// msg: "配置信息错误,请联系薪必果人员进行配置"
// };
// }
var signArr = []; var signArr = [];
signArr.push("appId=" + this.appId); signArr.push("appId=" + this.appId);
signArr.push("idNo=" + idNo); signArr.push("idNo=" + idNo);
...@@ -282,7 +271,6 @@ class YZContractApi { ...@@ -282,7 +271,6 @@ class YZContractApi {
signArr.push("startId=" + startId); signArr.push("startId=" + startId);
signArr.push("key=" + this.key); signArr.push("key=" + this.key);
var sign = md5(signArr.join("&")).toUpperCase(); var sign = md5(signArr.join("&")).toUpperCase();
console.log(signArr.join("&"))
console.log(sign); console.log(sign);
if (sign != obj.sign) { if (sign != obj.sign) {
return { return {
......
...@@ -911,7 +911,7 @@ class EcontractService extends ServiceBase { ...@@ -911,7 +911,7 @@ class EcontractService extends ServiceBase {
sql.push("FROM c_entcontract t1"); sql.push("FROM c_entcontract t1");
sql.push("INNER JOIN p_user_eaccount t2 ON t1.`usereaccount_id` = t2.`id`"); sql.push("INNER JOIN p_user_eaccount t2 ON t1.`usereaccount_id` = t2.`id`");
sql.push("INNER JOIN p_user t3 ON t2.`user_id` = t3.`id`"); sql.push("INNER JOIN p_user t3 ON t2.`user_id` = t3.`id`");
sql.push("WHERE t1.id > :startId AND t1.`entcompany_id` = :ecompanyId AND t1.`eflowstatus` = '2' AND t1.`end_at`>= NOW()"); sql.push("WHERE t1.id > :startId AND t1.`eflowstatus` = '2' AND t1.`end_at`>= NOW()");
if (params.idNo) { if (params.idNo) {
sql.push("AND t2.`personsSign` = :idNo"); sql.push("AND t2.`personsSign` = :idNo");
} }
......
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