d

center-manage/app/base/controller/impl/common/appCtl.js

@@ -19,6 +19,11 @@ class AppCtl extends CtlBase {
     let app= await this.cacheManager["AppCache"].cache(p.appkey, null);
     let app= await this.cacheManager["AppCache"].cache(p.appkey, null);
     return system.getResult(app);
     return system.getResult(app);
   }
   }
+  async getFuncs(p,q,req){
+      let appkey=p.appkey
+      let app= await this.cacheManager["AppCache"].cache(appkey, null);
+      return system.getResult({funcJson:JSON.parse(app.functionJSON)})
+  }
   async create(pobj, queryobj, req) {
   async create(pobj, queryobj, req) {
     pobj.creator_id = pobj.userid;//设置创建者
     pobj.creator_id = pobj.userid;//设置创建者
     return super.create(pobj, queryobj, req)
     return super.create(pobj, queryobj, req)

center-manage/app/base/controller/impl/common/companyCtl.js

@@ -18,7 +18,7 @@ class CompanyCtl extends CtlBase {
 
 
   async setOrgs(p,q,req){
   async setOrgs(p,q,req){
     let orgs=await this.service.setOrgs(p,req.xctx.fromcompanykey)
     let orgs=await this.service.setOrgs(p,req.xctx.fromcompanykey)
-    return system.getResult({orgJson:JSON.parse(companynew.orgJson)})
+    return system.getResult(orgs)
    }
    }
    async getOrgs(p,q,req){
    async getOrgs(p,q,req){
     let companynew=await this.cacheManager["CompanyCache"].cache(req.xctx.fromcompanykey)
     let companynew=await this.cacheManager["CompanyCache"].cache(req.xctx.fromcompanykey)

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

@@ -18,13 +18,16 @@ 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 users=await self.db.models.user.findAll({where:{opath:opathstr},transaction:t})
+        let us=await self.db.models.user.findAll({where:{opath:opathstr},transaction:t})
         //查询出角色
         //查询出角色
         let roleids=curNodeData.roles
         let roleids=curNodeData.roles
-        var roles = await self.roleDao.model.findAll({ where: { id: { [self.db.Op.in]: roleids }, app_id: p.app_id, company_id: p.company_id }, transaction: t });
-        users.forEach((u)=>{
-          await u.setRoles(roles, { 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})
+        for(let u of us){
+          await u.setRoles(rs,{transaction:t})
+        }
+        // users.forEach((u)=>{
+        //   await u.setRoles(rs, { transaction: t });
+        // })
       }
       }
       //用户缓存也要失效
       //用户缓存也要失效
       //缓存失效
       //缓存失效