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
68541249
Commit
68541249
authored
Oct 29, 2020
by
王昆
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
大同京东需求修改,sinedUser3rd改为通过etemplate_id进行查询
parent
bbf60f34
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
bpo-web/app/base/api/impl/econtractApi.js
+3
-2
bpo-web/app/base/service/impl/econtractSve.js
+1
-1
No files found.
bpo-web/app/base/api/impl/econtractApi.js
View file @
68541249
...
...
@@ -362,7 +362,7 @@ class EcontractApi {
let
idNos
=
await
this
.
usereaccountSve
.
idNoByUserId3rd
(
userId
);
var
params
=
{
e
companyId
:
busi
.
ecompany
_id
,
e
template_id
:
busi
.
etemplate
_id
,
startId
:
startId
,
idNo
:
idNo
.
toUpperCase
(),
pageSize
:
pageSize
,
...
...
@@ -571,7 +571,8 @@ class EcontractApi {
};
try
{
let
user
=
await
this
.
econtractSve
.
findSingleSignedUser
(
params
);
// let user = await this.econtractSve.findSingleSignedUser(params); // 旧版本,不要了
let
user
=
await
this
.
econtractSve
.
signingQuerytoPer
({
ecid
:
ecid
,
idNo
:
idNo
});
let
result
=
{
code
:
0
,
msg
:
"success"
,
...
...
bpo-web/app/base/service/impl/econtractSve.js
View file @
68541249
...
...
@@ -897,7 +897,7 @@ class EcontractService extends ServiceBase {
sql
.
push
(
"FROM c_econtract 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.`e
company_id` = :ecompanyI
d AND t1.`eflowstatus` = '2' AND t1.`end_at`>= NOW()"
);
sql
.
push
(
"WHERE t1.id > :startId AND t1.`e
template_id` = :etemplate_i
d 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