dd

xggsve-uc/app/base/service/impl/auth/authSve.js

@@ -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 {
     }
     }
 
 
     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]);
     return system.getResultSuccess(pmap[0]);

xggsve-uc/app/base/service/impl/org/orgSve.js

@@ -196,8 +196,8 @@ class OrgService extends ServiceBase {
    */
    */
   async listOrg(params) {
   async listOrg(params) {
     let where = {};
     let where = {};
-    let pageIndex = params.pageIndex || 1;
-    let pageSize = params.pageSize || 10;
+    let pageIndex = Number(params.pageIndex || 1);
+    let pageSize = Number(params.pageSize || 10);
     if (params.orgname) {
     if (params.orgname) {
       where.orgname = this.trim(params.orgname);
       where.orgname = this.trim(params.orgname);
     }
     }
@@ -215,6 +215,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}`);
@@ -226,7 +230,9 @@ class OrgService extends ServiceBase {
       return system.getResult(-1, `参数错误 ID不能为空`);
       return system.getResult(-1, `参数错误 ID不能为空`);
     }
     }
     try {
     try {
-      let _org = await this.findOne({id:this.trim(params.id)});
+      let _org = await this.dao.getById(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}`);
@@ -267,6 +273,7 @@ class OrgService extends ServiceBase {
       var all = await this.dao.all();
       var all = await this.dao.all();
       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 = [];
@@ -275,7 +282,7 @@ class OrgService extends ServiceBase {
         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

@@ -152,10 +152,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}`);      
@@ -168,8 +170,8 @@ class RoleService extends ServiceBase {
    */
    */
   async listRole(params) {
   async listRole(params) {
     let where = {};
     let where = {};
-    let pageIndex = params.pageIndex || 1;
-    let pageSize = params.pageSize || 10;
+    let pageIndex = Number(params.pageIndex || 1);
+    let pageSize = Number(params.pageSize || 10);
     if (params.code) {
     if (params.code) {
       where.code = this.trim(params.code);
       where.code = this.trim(params.code);
     }
     }
@@ -181,6 +183,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}`);