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
68c7555a
Commit
68c7555a
authored
Jun 04, 2020
by
孙亚楠
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d
parent
d70ab7e5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
xgg-deliver/app/base/controller/impl/order/orderCtl.js
+6
-6
xgg-deliver/app/config/routes/web.js
+2
-2
No files found.
xgg-deliver/app/base/controller/impl/order/orderCtl.js
View file @
68c7555a
...
...
@@ -543,9 +543,9 @@ class OrderCtl extends CtlBase {
if
(
!
pobj
.
customer_name
)
{
return
system
.
getResult
(
null
,
`参数错误 客户名称不能为空`
);
}
if
(
!
pobj
.
saas_id
){
return
system
.
getResult
(
null
,
`参数错误 saasId不能为空`
)
}
//
if(!pobj.saas_id){
//
return system.getResult(null,`参数错误 saasId不能为空`)
//
}
//ps:由于业务系统和服务系统字段不同需要转换 如果没有工商注册则必须见到列表中
if
(
!
pobj
.
chooseItems
.
includes
(
"10020200"
)){
pobj
.
chooseItems
.
push
(
"10020200"
);
...
...
@@ -707,9 +707,9 @@ class OrderCtl extends CtlBase {
"8"
:
"2080"
,
//客户交付
"9"
:
"2090"
//订单完成
};
if
(
!
pobj
.
saas_id
){
return
system
.
getResult
(
null
,
`登录失效,请重新登录`
);
}
//
if(!pobj.saas_id){
//
return system.getResult(null, `登录失效,请重新登录`);
//
}
var
condition
=
{
currentPage
:
Number
(
pobj
.
currentPage
||
1
),
pageSize
:
Number
(
pobj
.
pageSize
||
10
),
...
...
xgg-deliver/app/config/routes/web.js
View file @
68c7555a
...
...
@@ -69,7 +69,7 @@ module.exports = function (app) {
if
(
req
.
loginUser
)
{
req
.
query
=
req
.
query
||
{};
req
.
query
.
saas_id
=
req
.
loginUser
.
saas_id
;
//
req.query.saas_id = req.loginUser.saas_id;
req
.
query
.
deliverId
=
req
.
loginUser
.
deliver_id
||
""
;
req
.
query
.
deliver_id
=
req
.
loginUser
.
deliver_id
||
""
;
}
...
...
@@ -102,7 +102,7 @@ module.exports = function (app) {
req
.
body
.
classname
=
classPath
;
if
(
req
.
loginUser
)
{
req
.
body
.
saas_id
=
req
.
loginUser
.
saas_id
;
//
req.body.saas_id = req.loginUser.saas_id;
req
.
body
.
deliverId
=
req
.
loginUser
.
deliver_id
||
""
;
req
.
body
.
deliver_id
=
req
.
loginUser
.
deliver_id
||
""
;
req
.
body
.
deliverName
=
req
.
loginUser
.
deliver
.
name
||
""
;
...
...
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