Merge branch 'develop' into adiDev

# Conflicts:
#	src/controllers/CommandController.ts

src/interfaces/call-api.ts

@@ -76,7 +76,6 @@ class CallAPI {
           response: JSON.stringify(error),
         },
       });
-      console.log(error);
       throw error;
     }
   }

src/interfaces/permission.ts

@@ -53,7 +53,6 @@ class CheckAuth {
     return await new CallAPI()
       .GetData(req, `/org/permission/org/${system}/${action}`)
       .then(async (x) => {
-        console.log(x);
         let privilege = x.privilege;
         // if (action.trim().toLocaleUpperCase() == "CREATE")
         //   privilege = await this.PermissionCreate(req, system);
@@ -84,7 +83,16 @@ class CheckAuth {
         } else if (x.orgChild4Id == null) {
           node = 3;
         }
-        if (privilege == "ROOT") {
+        if (privilege == "OWNER") {
+          data = {
+            root: null,
+            child1: null,
+            child2: null,
+            child3: null,
+            child4: null,
+            privilege: "OWNER",
+          };
+        } else if (privilege == "ROOT") {
           data = {
             root: [x.orgRootId],
             child1: null,
@@ -112,15 +120,6 @@ class CheckAuth {
             privilege: "NORMAL",
           };
         } else if (privilege == "SPECIFIC") {
-        } else if (privilege == "OWNER") {
-          data = {
-            root: null,
-            child1: null,
-            child2: null,
-            child3: null,
-            child4: null,
-            privilege: "OWNER",
-          };
         }
 
         return data;