Skip to content

Z
zhichan
Commit 59ae67bd by 王昆
Options

Merge branch 'xggsve-uc' of gitlab.gongsibao.com:jiangyong/zhichan into xggsve-uc

parents 0cec34cb ea8dfdd3
Showing with 51 additions and 17 deletions
xggsve-uc/app/base/db/impl/user/userDao.js
...@@ -62,6 +62,8 @@ class UserDao extends Dao { ...@@ -62,6 +62,8 @@ class UserDao extends Dao {
sql.push("INNER JOIN uc_user_info t2 ON t1.id = t2.id"); sql.push("INNER JOIN uc_user_info t2 ON t1.id = t2.id");
sql.push("WHERE t1.deleted_at IS NULL"); sql.push("WHERE t1.deleted_at IS NULL");
this.setCondition(sql, params);
var list = await this.customQuery(sql.join(" "), params); var list = await this.customQuery(sql.join(" "), params);
if (!list || list.length == 0) { if (!list || list.length == 0) {
return 0; return 0;
...@@ -97,16 +99,16 @@ class UserDao extends Dao { ...@@ -97,16 +99,16 @@ class UserDao extends Dao {
sql.push("AND t1.saas_id = :saas_id"); sql.push("AND t1.saas_id = :saas_id");
} }
if (params.ucnameLike) { if (params.ucname) {
sql.push("AND t1.ucname LIKE :ucnameLike"); sql.push("AND t1.ucname LIKE :ucname");
} }
if (params.mobileLike) { if (params.mobile) {
sql.push("AND t2.mobile LIKE :mobileLike"); sql.push("AND t2.mobile LIKE :mobile");
} }
if (params.realNameLike) { if (params.realName) {
sql.push("AND t2.realName LIKE :realNameLike"); sql.push("AND t2.realName LIKE :realName");
} }
if (params.uctype) { if (params.uctype) {
...@@ -124,6 +126,10 @@ class UserDao extends Dao { ...@@ -124,6 +126,10 @@ class UserDao extends Dao {
if (params.isEnabled === 0 || params.isEnabled === 1) { if (params.isEnabled === 0 || params.isEnabled === 1) {
sql.push("AND t1.isEnabled = :isEnabled"); sql.push("AND t1.isEnabled = :isEnabled");
} }
if(params.orgpath) {
sql.push("AND t1.orgpath LIKE :orgpath");
}
} }
} }
module.exports = UserDao; module.exports = UserDao;
\ No newline at end of file
xggsve-uc/app/base/service/impl/auth/authSve.js
...@@ -76,6 +76,7 @@ class AuthService extends ServiceBase { ...@@ -76,6 +76,7 @@ class AuthService extends ServiceBase {
var pmap = {}; var pmap = {};
for (var item of all) { for (var item of all) {
item.label = item.name;
var list = pmap[item.pid]; var list = pmap[item.pid];
if (!list) { if (!list) {
list = []; list = [];
...@@ -85,7 +86,7 @@ class AuthService extends ServiceBase { ...@@ -85,7 +86,7 @@ class AuthService extends ServiceBase {
} }
for(var item of all) { for(var item of all) {
item.childs = pmap[item.id] || []; item.children = pmap[item.id] || [];
} }
return system.getResultSuccess(pmap[0][0]); return system.getResultSuccess(pmap[0][0]);
} }
......
xggsve-uc/app/base/service/impl/org/orgSve.js
...@@ -220,8 +220,8 @@ class OrgService extends ServiceBase { ...@@ -220,8 +220,8 @@ class OrgService extends ServiceBase {
*/ */
async listOrg(params) { async listOrg(params) {
let where = {}; let where = {};
let pageIndex = params.pageIndex || 1; let pageIndex = Number(params.pageIndex || 1);
let pageSize = params.pageSize || 10; let pageSize = Number(params.pageSize || 10);
if (params.orgname) { if (params.orgname) {
where.orgname = this.trim(params.orgname); where.orgname = this.trim(params.orgname);
} }
...@@ -239,6 +239,10 @@ class OrgService extends ServiceBase { ...@@ -239,6 +239,10 @@ class OrgService extends ServiceBase {
} }
try { try {
let orgList = await this.getPageList(pageIndex, pageSize, where); let orgList = await this.getPageList(pageIndex, pageSize, where);
for (let item of orgList.rows) {
this.handleDate(item,['created_at'],null,-8);
this.handleDate(item,['updated_at'],null,-8);
}
return system.getResult(orgList); return system.getResult(orgList);
} catch (error) { } catch (error) {
return system.getResult(-1, `系统错误 错误信息 ${error}`); return system.getResult(-1, `系统错误 错误信息 ${error}`);
...@@ -250,9 +254,9 @@ class OrgService extends ServiceBase { ...@@ -250,9 +254,9 @@ class OrgService extends ServiceBase {
return system.getResult(-1, `参数错误 ID不能为空`); return system.getResult(-1, `参数错误 ID不能为空`);
} }
try { try {
let _org = await this.findOne({ let _org = await this.dao.getById(this.trim(params.id));
id: this.trim(params.id) this.handleDate(_org,['created_at'],null,-8);
}); this.handleDate(_org,['updated_at'],null,-8);
return system.getResult(_org); return system.getResult(_org);
} catch (error) { } catch (error) {
return system.getResult(-1, `系统错误 错误信息 ${error}`); return system.getResult(-1, `系统错误 错误信息 ${error}`);
...@@ -293,6 +297,7 @@ class OrgService extends ServiceBase { ...@@ -293,6 +297,7 @@ class OrgService extends ServiceBase {
var all = await this.dao.all(params.saas_id); var all = await this.dao.all(params.saas_id);
var pmap = {}; var pmap = {};
for (var item of all) { for (var item of all) {
item.label = item.orgname;
var list = pmap[item.pid]; var list = pmap[item.pid];
if (!list) { if (!list) {
list = []; list = [];
...@@ -300,8 +305,8 @@ class OrgService extends ServiceBase { ...@@ -300,8 +305,8 @@ class OrgService extends ServiceBase {
list.push(item); list.push(item);
pmap[item.pid] = list; pmap[item.pid] = list;
} }
for (var item of all) { for(var item of all) {
item.childs = pmap[item.id] || []; item.children = pmap[item.id] || [];
} }
return system.getResult(pmap[0]); return system.getResult(pmap[0]);
} catch (error) { } catch (error) {
......
xggsve-uc/app/base/service/impl/role/roleSve.js
...@@ -179,10 +179,12 @@ class RoleService extends ServiceBase { ...@@ -179,10 +179,12 @@ class RoleService extends ServiceBase {
if(!params.id){ if(!params.id){
return system.getResult(-1,`参数错误 ID不能为空`); return system.getResult(-1,`参数错误 ID不能为空`);
} }
let _role = await this.findById(this.trim(params.id)); let _role = await this.dao.getById(this.trim(params.id));
if(!_role){ if(!_role){
return system.getResult(-1,`角色不存在`); return system.getResult(-1,`角色不存在`);
} }
this.handleDate(_role,['created_at'],null,-8);
this.handleDate(_role,['updated_at'],null,-8);
return system.getResult(_role); return system.getResult(_role);
} catch (error) { } catch (error) {
return system.getResult(-1, `系统错误 错误信息${error}`); return system.getResult(-1, `系统错误 错误信息${error}`);
...@@ -195,8 +197,8 @@ class RoleService extends ServiceBase { ...@@ -195,8 +197,8 @@ class RoleService extends ServiceBase {
*/ */
async listRole(params) { async listRole(params) {
let where = {}; let where = {};
let pageIndex = params.pageIndex || 1; let pageIndex = Number(params.pageIndex || 1);
let pageSize = params.pageSize || 10; let pageSize = Number(params.pageSize || 10);
if (params.code) { if (params.code) {
where.code = this.trim(params.code); where.code = this.trim(params.code);
} }
...@@ -208,6 +210,10 @@ class RoleService extends ServiceBase { ...@@ -208,6 +210,10 @@ class RoleService extends ServiceBase {
} }
try { try {
let roleList = await this.getPageList(pageIndex, pageSize, where); let roleList = await this.getPageList(pageIndex, pageSize, where);
for (let item of roleList.rows) {
this.handleDate(item,['created_at'],null,-8);
this.handleDate(item,['updated_at'],null,-8);
}
return system.getResult(roleList); return system.getResult(roleList);
} catch (error) { } catch (error) {
return system.getResult(-1, `系统错误 错误信息 ${error}`); return system.getResult(-1, `系统错误 错误信息 ${error}`);
......
xggsve-uc/app/base/service/impl/user/userSve.js
...@@ -24,6 +24,18 @@ class UserService extends ServiceBase { ...@@ -24,6 +24,18 @@ class UserService extends ServiceBase {
} }
} }
/**
* 根据path查询所有的用户
* @param {*} params
*/
async apiQueryUserByPath(params){
try {
return await this.queryUserByPath(params);
} catch (error) {
return system.getResult(-1, `系统错误 错误信息 ${error}`);
}
}
/**************************************************************** */ /**************************************************************** */
...@@ -257,6 +269,9 @@ class UserService extends ServiceBase { ...@@ -257,6 +269,9 @@ class UserService extends ServiceBase {
}; };
var currentPage = Number(params.currentPage || 1); var currentPage = Number(params.currentPage || 1);
var pageSize = Number(params.pageSize || 10); var pageSize = Number(params.pageSize || 10);
if(params.orgpath) {
params.orgpath = params.orgpath + "%";
}
var total = await this.dao.countByCondition(params); var total = await this.dao.countByCondition(params);
if (total == 0) { if (total == 0) {
......
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