gsb

xggsve-uc/app/base/api/impl/op/action.js

@@ -4,18 +4,12 @@ var settings = require("../../../../config/settings");
 class ActionAPI extends APIBase {
     constructor() {
         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.orgSve = system.getObject("service.org.orgSve");
         this.userSve = system.getObject("service.user.userSve");
->>>>>>> d793a05418eb96a09ec06c0b5c36f56cc16ed20c
         this.roleSve = system.getObject("service.role.roleSve");
+        this.authSve = system.getObject("service.auth.authSve");
+
     }
 
     /**
@@ -71,12 +65,7 @@ class ActionAPI extends APIBase {
                 opResult = await this.orgSve.apiUpdOrg(action_body);
                 break;
             case "delOrg":
-<<<<<<< HEAD
-                // 是否 uc_user_org 表中有数据
-                // 删除
-=======
                 opResult = await this.orgSve.apiDelOrg(action_body);    
->>>>>>> d793a05418eb96a09ec06c0b5c36f56cc16ed20c
                 break;
             case "listOrg":
                 opResult = await this.orgSve.apiListOrg(action_body);