Skip to content

Z
zhichan
Commit 38f3bd3d by 王昆
Options

gsb

parent fdade616
Showing with 2 additions and 13 deletions
xggsve-uc/app/base/api/impl/op/action.js
...@@ -4,18 +4,12 @@ var settings = require("../../../../config/settings"); ...@@ -4,18 +4,12 @@ var settings = require("../../../../config/settings");
class ActionAPI extends APIBase { class ActionAPI extends APIBase {
constructor() { constructor() {
super(); super();
<<<<<<< HEAD
this.saasSve = system.getObject("service.saas.saasSve");
this.userSve = system.getObject("service.user.userSve");
this.orgSve = system.getObject("service.org.orgSve");
this.authSve = system.getObject("service.auth.authSve");
=======
this.saasSve = system.getObject("service.saas.saasSve"); this.saasSve = system.getObject("service.saas.saasSve");
this.orgSve = system.getObject("service.org.orgSve"); this.orgSve = system.getObject("service.org.orgSve");
this.userSve = system.getObject("service.user.userSve"); this.userSve = system.getObject("service.user.userSve");
>>>>>>> d793a05418eb96a09ec06c0b5c36f56cc16ed20c
this.roleSve = system.getObject("service.role.roleSve"); this.roleSve = system.getObject("service.role.roleSve");
this.authSve = system.getObject("service.auth.authSve");
} }
/** /**
...@@ -71,12 +65,7 @@ class ActionAPI extends APIBase { ...@@ -71,12 +65,7 @@ class ActionAPI extends APIBase {
opResult = await this.orgSve.apiUpdOrg(action_body); opResult = await this.orgSve.apiUpdOrg(action_body);
break; break;
case "delOrg": case "delOrg":
<<<<<<< HEAD
// 是否 uc_user_org 表中有数据
// 删除
=======
opResult = await this.orgSve.apiDelOrg(action_body); opResult = await this.orgSve.apiDelOrg(action_body);
>>>>>>> d793a05418eb96a09ec06c0b5c36f56cc16ed20c
break; break;
case "listOrg": case "listOrg":
opResult = await this.orgSve.apiListOrg(action_body); opResult = await this.orgSve.apiListOrg(action_body);
......
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