Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Z
zhichan
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
蒋勇
zhichan
Commits
ab8ba502
Commit
ab8ba502
authored
Mar 02, 2020
by
zhaoxiqing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gsb
parent
65ea3769
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 additions
and
13 deletions
+1
-13
bpo-web/app/base/api/impl/yzcontractApi.js
+0
-12
bpo-web/app/base/service/impl/econtractSve.js
+1
-1
No files found.
bpo-web/app/base/api/impl/yzcontractApi.js
View file @
ab8ba502
...
...
@@ -257,23 +257,12 @@ class YZContractApi {
async
sinedMerchant3rd
(
obj
,
req
)
{
// 验证合法性
var
appId
=
obj
.
appId
;
var
nonceStr
=
obj
.
nonceStr
;
var
idNo
=
obj
.
idNo
||
""
;
var
startId
=
obj
.
startId
||
0
;
var
merchantId
=
obj
.
merchantId
||
""
;
var
pageSize
=
20
;
// var busi = await this.ecompanybusiSve.findOne({
// appId: appId
// });
// if (!busi) {
// return {
// code: 1001003,
// msg: "配置信息错误,请联系薪必果人员进行配置"
// };
// }
var
signArr
=
[];
signArr
.
push
(
"appId="
+
this
.
appId
);
signArr
.
push
(
"idNo="
+
idNo
);
...
...
@@ -282,7 +271,6 @@ class YZContractApi {
signArr
.
push
(
"startId="
+
startId
);
signArr
.
push
(
"key="
+
this
.
key
);
var
sign
=
md5
(
signArr
.
join
(
"&"
)).
toUpperCase
();
console
.
log
(
signArr
.
join
(
"&"
))
console
.
log
(
sign
);
if
(
sign
!=
obj
.
sign
)
{
return
{
...
...
bpo-web/app/base/service/impl/econtractSve.js
View file @
ab8ba502
...
...
@@ -911,7 +911,7 @@ class EcontractService extends ServiceBase {
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 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
)
{
sql
.
push
(
"AND t2.`personsSign` = :idNo"
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment