Commit 68c7555a by 孙亚楠

d

parent d70ab7e5
...@@ -543,9 +543,9 @@ class OrderCtl extends CtlBase { ...@@ -543,9 +543,9 @@ class OrderCtl extends CtlBase {
if (!pobj.customer_name) { if (!pobj.customer_name) {
return system.getResult(null, `参数错误 客户名称不能为空`); return system.getResult(null, `参数错误 客户名称不能为空`);
} }
if(!pobj.saas_id){ // if(!pobj.saas_id){
return system.getResult(null,`参数错误 saasId不能为空`) // return system.getResult(null,`参数错误 saasId不能为空`)
} // }
//ps:由于业务系统和服务系统字段不同需要转换 如果没有工商注册则必须见到列表中 //ps:由于业务系统和服务系统字段不同需要转换 如果没有工商注册则必须见到列表中
if(!pobj.chooseItems.includes("10020200")){ if(!pobj.chooseItems.includes("10020200")){
pobj.chooseItems.push("10020200"); pobj.chooseItems.push("10020200");
...@@ -707,9 +707,9 @@ class OrderCtl extends CtlBase { ...@@ -707,9 +707,9 @@ class OrderCtl extends CtlBase {
"8":"2080",//客户交付 "8":"2080",//客户交付
"9":"2090"//订单完成 "9":"2090"//订单完成
}; };
if(!pobj.saas_id){ // if(!pobj.saas_id){
return system.getResult(null, `登录失效,请重新登录`); // return system.getResult(null, `登录失效,请重新登录`);
} // }
var condition = { var condition = {
currentPage: Number(pobj.currentPage || 1), currentPage: Number(pobj.currentPage || 1),
pageSize: Number(pobj.pageSize || 10), pageSize: Number(pobj.pageSize || 10),
......
...@@ -69,7 +69,7 @@ module.exports = function (app) { ...@@ -69,7 +69,7 @@ module.exports = function (app) {
if(req.loginUser) { if(req.loginUser) {
req.query = req.query || {}; 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.deliverId = req.loginUser.deliver_id || "";
req.query.deliver_id = req.loginUser.deliver_id || ""; req.query.deliver_id = req.loginUser.deliver_id || "";
} }
...@@ -102,7 +102,7 @@ module.exports = function (app) { ...@@ -102,7 +102,7 @@ module.exports = function (app) {
req.body.classname = classPath; req.body.classname = classPath;
if(req.loginUser) { 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.deliverId = req.loginUser.deliver_id || "";
req.body.deliver_id = req.loginUser.deliver_id || ""; req.body.deliver_id = req.loginUser.deliver_id || "";
req.body.deliverName = req.loginUser.deliver.name ||""; req.body.deliverName = req.loginUser.deliver.name ||"";
......
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