gsb

xggsve-common/app/base/service/impl/deliver/deliverSve.js

@@ -294,13 +294,13 @@ class DeliverService extends ServiceBase {
       ["id", 'desc']
       ["id", 'desc']
     ];
     ];
 
 
-    let page = await this.getPageList(currentPage, pageSize, where, orderby, null);
+    let page = await this.deliveruserDao.getPageList(currentPage, pageSize, where, orderby, null);
     if (page && page.rows) {
     if (page && page.rows) {
       for (var row of page.rows) {
       for (var row of page.rows) {
+        row.password = "";
         this.handleDate(row, ["created_at"], null, -8);
         this.handleDate(row, ["created_at"], null, -8);
         this.setAuth(row);
         this.setAuth(row);
       }
       }
-      await this.setUser(page.rows);
     }
     }
     return system.getResultSuccess(page);
     return system.getResultSuccess(page);
   }
   }
@@ -308,12 +308,14 @@ class DeliverService extends ServiceBase {
   setAuth(row) {
   setAuth(row) {
     let auth = row.auth;
     let auth = row.auth;
     if(!auth || auth.length < 4) {
     if(!auth || auth.length < 4) {
+      row.auth = [];
+      row.authNames = "";
       return;
       return;
     }
     }
-    let gsb = Number(user.auth[0] || 0);
-    let cwb = Number(user.auth[1] || 0);
-    let swb = Number(user.auth[2] || 0);
-    let pjb = Number(user.auth[3] || 0);
+    let gsb = Number(row.auth[0] || 0);
+    let cwb = Number(row.auth[1] || 0);
+    let swb = Number(row.auth[2] || 0);
+    let pjb = Number(row.auth[3] || 0);
     let authArr = [];
     let authArr = [];
 
 
     let authNames = [];
     let authNames = [];
@@ -333,7 +335,7 @@ class DeliverService extends ServiceBase {
       authArr.push(4);
       authArr.push(4);
       authNames.push("票据宝");
       authNames.push("票据宝");
     }
     }
-    user.auth = authArr.join("");
+    row.auth = authArr;
     row.authNames = authNames.join("、");
     row.authNames = authNames.join("、");
   }
   }
 
 
@@ -342,6 +344,7 @@ class DeliverService extends ServiceBase {
     let user = await this.deliveruserDao.getById(id) || {};
     let user = await this.deliveruserDao.getById(id) || {};
     user.password = "";
     user.password = "";
     this.setAuth(user);
     this.setAuth(user);
+    return system.getResultSuccess(user);
   }
   }
   async deliverUserSave(params) {
   async deliverUserSave(params) {
     let deliver_id = params.deliver_id;
     let deliver_id = params.deliver_id;
@@ -355,7 +358,14 @@ class DeliverService extends ServiceBase {
     let org_id = params.org_id;
     let org_id = params.org_id;
     let password = params.password;
     let password = params.password;
     let isAdmin = Number(params.isAdmin || 0);
     let isAdmin = Number(params.isAdmin || 0);
-    let authArr = params.auth || [];
+    let authArr = [];
+    if(params.auth) {
+      for(let authCode of params.auth) {
+        if(authCode) {
+          authArr.push(Number(authCode));
+        }
+      }
+    }
 
 
     let deliver = await this.dao.findById(deliver_id);
     let deliver = await this.dao.findById(deliver_id);
     if(!deliver) {
     if(!deliver) {
@@ -383,7 +393,7 @@ class DeliverService extends ServiceBase {
     user.isAdmin = isAdmin ? true : false;
     user.isAdmin = isAdmin ? true : false;
     let auth = [];
     let auth = [];
     for (let i = 1; i <= 4; i++) {
     for (let i = 1; i <= 4; i++) {
-      if(authArr.indexOf(i.toString()) == -1) {
+      if(authArr.indexOf(i) == -1) {
         auth.push("0");
         auth.push("0");
       } else {
       } else {
         auth.push("1");
         auth.push("1");
@@ -420,7 +430,7 @@ class DeliverService extends ServiceBase {
         pmap[item.parent_id] = list;
         pmap[item.parent_id] = list;
       }
       }
       for(var item of all) {
       for(var item of all) {
-        item.children = pmap[item.parent_id] || [];
+        item.children = pmap[item.id] || [];
       }
       }
       return system.getResult(pmap[0]);
       return system.getResult(pmap[0]);
     } catch (error) {
     } catch (error) {
@@ -477,12 +487,13 @@ class DeliverService extends ServiceBase {
     org.group_type = 0;
     org.group_type = 0;
     if(org.id) {
     if(org.id) {
       await org.save();
       await org.save();
+
+      // TODO 修改该组织机构下用户树
     } else {
     } else {
       org = await this.deliverorgDao.model.create(org);
       org = await this.deliverorgDao.model.create(org);
     }
     }
     return system.getResultSuccess();
     return system.getResultSuccess();
   }
   }
-
 }
 }
 
 
 module.exports = DeliverService;
 module.exports = DeliverService;