gsb

bpo-admin/app/base/controller/impl/epartnerCtl.js

@@ -23,8 +23,10 @@ class EpartnerCtl extends CtlBase {
   }
   }
 
 
   async info(queryobj, qobj, req) {
   async info(queryobj, qobj, req) {
+    let user = req.session.user;
+    user.department = req.session.department;
     var result = {
     var result = {
-      user: req.session.user,
+      user: user,
       epartner: req.session.partner,
       epartner: req.session.partner,
     }
     }
     return system.getResult2(result);
     return system.getResult2(result);

bpo-admin/app/base/controller/impl/userCtl.js

@@ -363,6 +363,7 @@ class UserCtl extends CtlBase {
 
 
     if (existedUser) {
     if (existedUser) {
       req.session.user = existedUser;
       req.session.user = existedUser;
+      req.session.department = existedUser.department;
       if (existedUser.isPartner) {
       if (existedUser.isPartner) {
         req.session.partner = await this.epartnerSve.findOne({
         req.session.partner = await this.epartnerSve.findOne({
           user_id: existedUser.id
           user_id: existedUser.id

bpo-admin/app/base/service/impl/userSve.js

@@ -326,7 +326,7 @@ class UserService extends ServiceBase {
         as: "Roles",
         as: "Roles",
         attributes: ["id", "code"]
         attributes: ["id", "code"]
       },],
       },],
-      raw:true
+      // raw:true
     });
     });
     if(u && u.department_id) {
     if(u && u.department_id) {
       u.department = await this.departmentDao.findById(u.department_id);
       u.department = await this.departmentDao.findById(u.department_id);