d

center-manage/app/base/service/impl/common/companySve.js

@@ -42,18 +42,22 @@ class CompanyService extends ServiceBase {
       let curNodeData=p.curdata
       let curNodeData=p.curdata
       if(curNodeData && curNodeData.isPosition){
       if(curNodeData && curNodeData.isPosition){
         let opathstr=curNodeData.orgpath
         let opathstr=curNodeData.orgpath
-        let us=await self.db.models.user.findAll({where:{opath:opathstr},transaction:t})
+        let us=await self.db.models.user.findAll({where:{opath:{[self.db.Op.like]:`%${opathstr}%`}},transaction:t})
         //查询出角色
         //查询出角色
         let roleids=curNodeData.roles
         let roleids=curNodeData.roles
-        let rs=await self.db.models.role.findAll({where:{id:{[self.db.Op.in]:roleids},app_id:p.app_id,company_id:p.company_id},transaction:t})
+       // let rs=await self.db.models.role.findAll({where:{id:{[self.db.Op.in]:roleids},app_id:p.app_id,company_id:p.company_id},transaction:t})
+        let rs=await self.db.models.role.findAll({where:{id:{[self.db.Op.in]:roleids},company_id:p.company_id},transaction:t})
         for(let u of us){
         for(let u of us){
           await u.setRoles(rs,{transaction:t})
           await u.setRoles(rs,{transaction:t})
+          //令用户缓存失效
+          await self.cacheManager["UserCache"].invalidate(u.userName) 
         }
         }
         // users.forEach((u)=>{
         // users.forEach((u)=>{
         //   await u.setRoles(rs, { transaction: t });
         //   await u.setRoles(rs, { transaction: t });
         // })
         // })
       }
       }
       //用户缓存也要失效
       //用户缓存也要失效
+
       //缓存失效
       //缓存失效
       await self.cacheManager["CompanyCache"].invalidate(cmk)
       await self.cacheManager["CompanyCache"].invalidate(cmk)
       let companytmp=await self.dao.model.findOne({where:{companykey:cmk},transaction:t});
       let companytmp=await self.dao.model.findOne({where:{companykey:cmk},transaction:t});

center-manage/app/base/test.js

@@ -28,3 +28,6 @@ for(let i=0;i<rows.length;i++){
   }
   }
 }
 }
 console.log(mid)
 console.log(mid)
+
+
+