Skip to content

Z
zhichan
Commit d29f0c18 by 王昆
Options

gsb

parent 9a1459e8
Showing with 90 additions and 42 deletions
xggsve-common/app/base/api/impl/op/action.js
...@@ -124,6 +124,14 @@ class ActionAPI extends APIBase { ...@@ -124,6 +124,14 @@ class ActionAPI extends APIBase {
case "deliverUserSave": case "deliverUserSave":
opResult = await this.deliverSve.deliverUserSave(action_body); opResult = await this.deliverSve.deliverUserSave(action_body);
break; break;
case "deliverUserInfo":
opResult = await this.deliverSve.deliverUserInfo(action_body);
break;
case "deliverSynUpdate":
opResult = await this.deliverSve.deliverSynUpdate(action_body);
break;
case "orgTree": case "orgTree":
opResult = await this.deliverSve.orgTree(action_body); opResult = await this.deliverSve.orgTree(action_body);
......
xggsve-common/app/base/db/models/deliver/deliver.js
...@@ -13,6 +13,7 @@ module.exports = (db, DataTypes) => { ...@@ -13,6 +13,7 @@ module.exports = (db, DataTypes) => {
type: DataTypes.BOOLEAN, type: DataTypes.BOOLEAN,
allowNull: true, allowNull: true,
}, },
nt_company_id: DataTypes.STRING,
saas_id: DataTypes.STRING, saas_id: DataTypes.STRING,
}, { }, {
paranoid: true, //假的删除 paranoid: true, //假的删除
......
xggsve-common/app/base/db/models/deliver/deliveruser.js
...@@ -16,6 +16,7 @@ module.exports = (db, DataTypes) => { ...@@ -16,6 +16,7 @@ module.exports = (db, DataTypes) => {
org_id: DataTypes.INTEGER, org_id: DataTypes.INTEGER,
org_path: DataTypes.STRING, org_path: DataTypes.STRING,
auth: DataTypes.STRING, auth: DataTypes.STRING,
nt_user_id: DataTypes.STRING,
}, { }, {
paranoid: true, //假的删除 paranoid: true, //假的删除
underscored: true, underscored: true,
......
xggsve-common/app/base/service/impl/deliver/deliverSve.js
...@@ -109,7 +109,7 @@ class DeliverService extends ServiceBase { ...@@ -109,7 +109,7 @@ class DeliverService extends ServiceBase {
let user; let user;
if (id) { if (id) {
deliver = await this.dao.findById(id); deliver = await this.dao.findById(id);
if(deliver.admin_id) { if (deliver.admin_id) {
user = await this.deliveruserDao.findById(deliver.admin_id); user = await this.deliveruserDao.findById(deliver.admin_id);
} }
} else { } else {
...@@ -117,8 +117,8 @@ class DeliverService extends ServiceBase { ...@@ -117,8 +117,8 @@ class DeliverService extends ServiceBase {
} }
if (!user) { if (!user) {
let exists = await this.deliveruserDao.findOne({ucname: params.ucname}); let exists = await this.deliveruserDao.findOne({ ucname: params.ucname });
if(exists) { if (exists) {
return system.getResult(null, `用户名【${params.ucname}】已存在`); return system.getResult(null, `用户名【${params.ucname}】已存在`);
} }
} }
...@@ -151,7 +151,7 @@ class DeliverService extends ServiceBase { ...@@ -151,7 +151,7 @@ class DeliverService extends ServiceBase {
deliver.admin_id = user.id; deliver.admin_id = user.id;
await deliver.save(); await deliver.save();
if(user.org_id) { if (user.org_id) {
let org = await this.deliverorgDao.findById(user.org_id); let org = await this.deliverorgDao.findById(user.org_id);
org.name = deliver.name; org.name = deliver.name;
org.path = deliver.name + "."; org.path = deliver.name + ".";
...@@ -175,7 +175,7 @@ class DeliverService extends ServiceBase { ...@@ -175,7 +175,7 @@ class DeliverService extends ServiceBase {
user.org_path = org.path; user.org_path = org.path;
await user.save(); await user.save();
} }
return system.getResultSuccess(); return system.getResultSuccess(deliver);
} }
async updPassword(params) { async updPassword(params) {
...@@ -268,7 +268,7 @@ class DeliverService extends ServiceBase { ...@@ -268,7 +268,7 @@ class DeliverService extends ServiceBase {
let sql = "SELECT * FROM d_deliver_user WHERE id IN (:ids)"; let sql = "SELECT * FROM d_deliver_user WHERE id IN (:ids)";
let list = await this.customQuery(sql, {ids: params.ids}); let list = await this.customQuery(sql, { ids: params.ids });
let result = {}; let result = {};
if (!list || list.length == 0) { if (!list || list.length == 0) {
...@@ -286,14 +286,26 @@ class DeliverService extends ServiceBase { ...@@ -286,14 +286,26 @@ class DeliverService extends ServiceBase {
let pageSize = Number(params.pageSize || 10); let pageSize = Number(params.pageSize || 10);
let deliver_id = params.deliver_id; let deliver_id = params.deliver_id;
if(!deliver_id) { if (!deliver_id) {
return system.getResultSuccess({count:0, rows:[], msg:"deliver_id is empty"}); return system.getResultSuccess({ count: 0, rows: [], msg: "deliver_id is empty" });
} }
let where = { let where = {
deliver_id: deliver_id deliver_id: deliver_id
}; };
if(params.org_id) {
let org = await this.deliverorgDao.findById(params.org_id);
if(!org) {
return system.getResultSuccess({ count: 0, rows: [], msg: "deliver_id is empty" });
}
where.org_path = {
[this.db.Op.like]: org.path + "%"
};
}
let orderby = [ let orderby = [
["id", 'desc'] ["id", 'desc']
]; ];
...@@ -310,14 +322,40 @@ class DeliverService extends ServiceBase { ...@@ -310,14 +322,40 @@ class DeliverService extends ServiceBase {
return system.getResultSuccess(page); return system.getResultSuccess(page);
} }
async deliverUserInfo(params) {
let id = params.id;
let user = await this.deliveruserDao.findById(id);
let deliver = await this.findById(user.deliver_id);
return system.getResult({
user: user,
deliver: deliver,
});
}
async deliverSynUpdate(params) {
let user = await this.deliveruserDao.findById(params.user_id);
let deliver = await this.findById(user.deliver_id);
if(!user.nt_user_id) {
user.nt_user_id = params.nt_user_id;
await user.save();
}
if(!deliver.nt_company_id) {
deliver.nt_company_id = params.nt_company_id;
await deliver.save();
}
return system.getResultSuccess();
}
setAuth(row) { setAuth(row) {
if(row.isManager) { if (row.isManager) {
row.auth = [1,2,3,4]; row.auth = [1, 2, 3, 4];
row.authNames = "管理员"; row.authNames = "管理员";
return; return;
} }
let auth = row.auth; let auth = row.auth;
if(!auth || auth.length < 4) { if (!auth || auth.length < 4) {
row.auth = []; row.auth = [];
row.authNames = ""; row.authNames = "";
return; return;
...@@ -329,19 +367,19 @@ class DeliverService extends ServiceBase { ...@@ -329,19 +367,19 @@ class DeliverService extends ServiceBase {
let authArr = []; let authArr = [];
let authNames = []; let authNames = [];
if(gsb) { if (gsb) {
authArr.push(1); authArr.push(1);
authNames.push("工商宝"); authNames.push("工商宝");
} }
if(cwb) { if (cwb) {
authArr.push(2); authArr.push(2);
authNames.push("财务宝"); authNames.push("财务宝");
} }
if(swb) { if (swb) {
authArr.push(3); authArr.push(3);
authNames.push("税务宝"); authNames.push("税务宝");
} }
if(pjb) { if (pjb) {
authArr.push(4); authArr.push(4);
authNames.push("票据宝"); authNames.push("票据宝");
} }
...@@ -349,18 +387,18 @@ class DeliverService extends ServiceBase { ...@@ -349,18 +387,18 @@ class DeliverService extends ServiceBase {
row.authNames = authNames.join("、"); row.authNames = authNames.join("、");
} }
async setOrg (rows) { async setOrg(rows) {
if(!rows || rows.length == 0) { if (!rows || rows.length == 0) {
return; return;
} }
let orgIds = []; let orgIds = [];
for(let row of rows) { for (let row of rows) {
orgIds.push(row.org_id); orgIds.push(row.org_id);
} }
let orgMap = await this.deliverorgDao.findMapByIds(orgIds); let orgMap = await this.deliverorgDao.findMapByIds(orgIds);
for(let row of rows) { for (let row of rows) {
row.org = orgMap[row.org_id] || {}; row.org = orgMap[row.org_id] || {};
} }
} }
...@@ -373,7 +411,7 @@ class DeliverService extends ServiceBase { ...@@ -373,7 +411,7 @@ class DeliverService extends ServiceBase {
} }
async deliverUserSave(params) { async deliverUserSave(params) {
let deliver_id = params.deliver_id; let deliver_id = params.deliver_id;
if(!deliver_id) { if (!deliver_id) {
return system.getResult(null, "交付商不存在"); return system.getResult(null, "交付商不存在");
} }
...@@ -384,29 +422,29 @@ class DeliverService extends ServiceBase { ...@@ -384,29 +422,29 @@ class DeliverService extends ServiceBase {
let password = params.password; let password = params.password;
let isAdmin = Number(params.isAdmin || 0); let isAdmin = Number(params.isAdmin || 0);
let authArr = []; let authArr = [];
if(params.auth) { if (params.auth) {
for(let authCode of params.auth) { for (let authCode of params.auth) {
if(authCode) { if (authCode) {
authArr.push(Number(authCode)); authArr.push(Number(authCode));
} }
} }
} }
let deliver = await this.dao.findById(deliver_id); let deliver = await this.dao.findById(deliver_id);
if(!deliver) { if (!deliver) {
return system.getResult(null, "交付商不存在"); return system.getResult(null, "交付商不存在");
} }
let org = await this.deliverorgDao.findById(org_id); let org = await this.deliverorgDao.findById(org_id);
if(!org) { if (!org) {
return system.getResult(null, "组织机构不存在"); return system.getResult(null, "组织机构不存在");
} }
let user; let user;
if(id) { if (id) {
user = await this.deliveruserDao.findById(id); user = await this.deliveruserDao.findById(id);
} else { } else {
user = await this.deliveruserDao.findOne({ucname: ucname}); user = await this.deliveruserDao.findOne({ ucname: ucname });
if(user) { if (user) {
return system.getResult(null, `账号【${ucname}】已存在`) return system.getResult(null, `账号【${ucname}】已存在`)
} }
user = {}; user = {};
...@@ -418,7 +456,7 @@ class DeliverService extends ServiceBase { ...@@ -418,7 +456,7 @@ class DeliverService extends ServiceBase {
user.isAdmin = isAdmin ? true : false; user.isAdmin = isAdmin ? true : false;
let auth = []; let auth = [];
for (let i = 1; i <= 4; i++) { for (let i = 1; i <= 4; i++) {
if(authArr.indexOf(i) == -1) { if (authArr.indexOf(i) == -1) {
auth.push("0"); auth.push("0");
} else { } else {
auth.push("1"); auth.push("1");
...@@ -426,7 +464,7 @@ class DeliverService extends ServiceBase { ...@@ -426,7 +464,7 @@ class DeliverService extends ServiceBase {
} }
user.auth = auth.join(""); user.auth = auth.join("");
if(user.id) { if (user.id) {
await user.save(); await user.save();
} else { } else {
user.saas_id = deliver.saas_id; user.saas_id = deliver.saas_id;
...@@ -436,18 +474,18 @@ class DeliverService extends ServiceBase { ...@@ -436,18 +474,18 @@ class DeliverService extends ServiceBase {
user = await this.deliveruserDao.model.create(user); user = await this.deliveruserDao.model.create(user);
} }
return system.getResultSuccess(); return system.getResultSuccess(user);
} }
async orgTree(params) { async orgTree(params) {
try { try {
let deliver_id = params.deliver_id; let deliver_id = params.deliver_id;
if(!deliver_id) { if (!deliver_id) {
return system.getResult(null, "交付商不存在"); return system.getResult(null, "交付商不存在");
} }
var all = await this.deliverorgDao.byDeliverId(params.deliver_id, '') || []; var all = await this.deliverorgDao.byDeliverId(params.deliver_id, '') || [];
for(let row of all) { for (let row of all) {
this.handleDate(row, ["created_at"], null, -8); this.handleDate(row, ["created_at"], null, -8);
} }
var pmap = {}; var pmap = {};
...@@ -457,7 +495,7 @@ class DeliverService extends ServiceBase { ...@@ -457,7 +495,7 @@ class DeliverService extends ServiceBase {
list.push(item); list.push(item);
pmap[item.parent_id] = list; pmap[item.parent_id] = list;
} }
for(let item of all) { for (let item of all) {
item.children = pmap[item.id] || []; item.children = pmap[item.id] || [];
} }
return system.getResult(pmap[0]); return system.getResult(pmap[0]);
...@@ -473,11 +511,11 @@ class DeliverService extends ServiceBase { ...@@ -473,11 +511,11 @@ class DeliverService extends ServiceBase {
async allOrg(params) { async allOrg(params) {
let deliver_id = params.deliver_id; let deliver_id = params.deliver_id;
if(!deliver_id) { if (!deliver_id) {
return system.getResultSuccess([]); return system.getResultSuccess([]);
} }
var all = await this.deliverorgDao.byDeliverId(params.deliver_id, '') || []; var all = await this.deliverorgDao.byDeliverId(params.deliver_id, '') || [];
for(let row of all) { for (let row of all) {
this.handleDate(row, ["created_at"], null, -8); this.handleDate(row, ["created_at"], null, -8);
} }
return system.getResultSuccess(all); return system.getResultSuccess(all);
...@@ -488,23 +526,23 @@ class DeliverService extends ServiceBase { ...@@ -488,23 +526,23 @@ class DeliverService extends ServiceBase {
let pid = params.pid; let pid = params.pid;
let name = params.name; let name = params.name;
let deliver_id = params.deliver_id; let deliver_id = params.deliver_id;
if(!pid) { if (!pid) {
return system.getResult(null, "请选择上级部门"); return system.getResult(null, "请选择上级部门");
} }
let parent = await this.deliverorgDao.findById(pid); let parent = await this.deliverorgDao.findById(pid);
if(!parent) { if (!parent) {
return system.getResult(null, "上级部门不存在"); return system.getResult(null, "上级部门不存在");
} }
if(!name) { if (!name) {
return system.getResult(null, "请填写部门名称"); return system.getResult(null, "请填写部门名称");
} }
if(!deliver_id) { if (!deliver_id) {
return system.getResult(null, "交付商不存在"); return system.getResult(null, "交付商不存在");
} }
let org; let org;
if(id) { if (id) {
org = await this.deliverorgDao.findById(id); org = await this.deliverorgDao.findById(id);
} else { } else {
org = {}; org = {};
...@@ -516,7 +554,7 @@ class DeliverService extends ServiceBase { ...@@ -516,7 +554,7 @@ class DeliverService extends ServiceBase {
org.type = ''; org.type = '';
org.del_flag = 0; org.del_flag = 0;
org.group_type = 0; org.group_type = 0;
if(org.id) { if (org.id) {
await org.save(); await org.save();
// TODO 修改该组织机构下用户树 // TODO 修改该组织机构下用户树
......
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