Merge branch 'center-manage' of gitlab.gongsibao.com:jiangyong/zhichan into center-manage

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

@@ -44,7 +44,8 @@ class CompanyCtl extends CtlBase {
     return system.getResult(orgs)
     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)
+    let companynew=await this.service.findById(p.company_id)
     let orgjsonstr=companynew.orgJson
     let orgjsonstr=companynew.orgJson
     let rtnjson=null
     let rtnjson=null
     if(orgjsonstr && orgjsonstr!=""){
     if(orgjsonstr && orgjsonstr!=""){

center-manage/app/base/db/impl/auth/roleDao.js

@@ -15,7 +15,7 @@ class RoleDao extends Dao{
     //  //     w["app_id"]=obj.appid;
     //  //     w["app_id"]=obj.appid;
     //  //  }
     //  //  }
     // }
     // }
-    w["app_id"]=obj.app_id;
+    //w["app_id"]=obj.app_id;//不考虑应用的区别
     w["company_id"]=obj.company_id;
     w["company_id"]=obj.company_id;
     return w;
     return w;
  }
  }

center-manage/app/base/service/impl/product/productpriceSve.js

@@ -36,6 +36,9 @@ class ProductpriceService extends ServiceBase {
         }
         }
       })
       })
       let codeval=String(areainfos[0].code).padEnd(6,'0')
       let codeval=String(areainfos[0].code).padEnd(6,'0')
+      if(areainfos[0].name.indexOf("天津") ||areainfos[0].name.indexOf("北京") || areainfos[0].name.indexOf("上海") || areainfos[0].name.indexOf("重庆")){
+        codeval=String(areainfos[0].code+"01").padEnd(6,'0')
+      }
       if(!cacheregions[codeval]){
       if(!cacheregions[codeval]){
         cacheregions[codeval]=regioninfo
         cacheregions[codeval]=regioninfo
         regioninfo["code"] = codeval
         regioninfo["code"] = codeval