d

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

@@ -8,59 +8,64 @@ class CompanyCtl extends CtlBase {
   constructor() {
   constructor() {
     super("common", CtlBase.getServiceName(CompanyCtl));
     super("common", CtlBase.getServiceName(CompanyCtl));
   }
   }
-  async update(p,q,req){
-   let u= await super.update(p,q,req)
-   //缓存失效
-   await this.cacheManager["CompanyCache"].invalidate(p.companykey)
-   let company=await this.cacheManager["CompanyCache"].cache(p.companykey)
-   return system.getResult(company)
+  async update (p, q, req) {
+    let u = await super.update(p, q, req)
+    //缓存失效
+    await this.cacheManager["CompanyCache"].invalidate(p.companykey)
+    let company = await this.cacheManager["CompanyCache"].cache(p.companykey)
+    return system.getResult(company)
   }
   }
-  async getMyApps(p,q,req){
+
+  async getMyApps (p, q, req) {
     let userfind = await this.cacheManager["UserCache"].cache(p.username)
     let userfind = await this.cacheManager["UserCache"].cache(p.username)
-    let isSuper=userfind.isSuper
-    if(userfind.company.appids && userfind.company.appids!=""){
-      let appsarray=userfind.company.appids.split(",")
-      let appidsquery=appsarray.map(astr=>{
-         return astr.split("|")[0]
+    let isSuper = userfind.isSuper
+    if (userfind.company.appids && userfind.company.appids != "") {
+      let appsarray = userfind.company.appids.split(",")
+      let appidsquery = appsarray.map(astr => {
+        return astr.split("|")[0]
       })
       })
-      let apps=await this.service.getMyApps(appidsquery,isSuper)
+      let apps = await this.service.getMyApps(appidsquery, isSuper)
       return system.getResult(apps)
       return system.getResult(apps)
-    }else{
+    } else {
       return []
       return []
     }
     }
   }
   }
-  async bindApps(p,q,req){
-     let appids=p.appids
-     let cmpid=p.postcmpid
-     let appids2=appids.map(item=>{
-       return item.appid+"|"+item.title
-     })
-     let appidstrs=appids2.join(",")
-     await this.service.bindApps(appidstrs,cmpid)
+  async bindApps (p, q, req) {
+    let appids = p.appids
+    let cmpid = p.postcmpid
+    let appids2 = appids.map(item => {
+      return item.appid + "|" + item.title
+    })
+    let appidstrs = appids2.join(",")
+    await this.service.bindApps(appidstrs, cmpid)
     return system.getResult(appids)
     return system.getResult(appids)
   }
   }
-  async setOrgs(p,q,req){
+  async setOrgs (p, q, req) {
     //let companynew=await this.service.findById(p.company_id)
     //let companynew=await this.service.findById(p.company_id)
-    let orgs=await this.service.setOrgs(p)
+    let orgs = await this.service.setOrgs(p)
     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 rtnjson=null
-    if(orgjsonstr && orgjsonstr!=""){
-      rtnjson=JSON.parse(companynew.orgJson)
-    }else{
-      rtnjson=[]
+    let companynew = await this.service.findById(p.company_id)
+    let orgjsonstr = companynew.orgJson
+    let rtnjson = null
+    if (orgjsonstr && orgjsonstr != "") {
+      rtnjson = JSON.parse(companynew.orgJson)
+    } else {
+      rtnjson = []
     }
     }
-    return system.getResult({orgJson:rtnjson})
-   }
+    return system.getResult({ orgJson: rtnjson })
+  }
+  async getWatchOrgNodes (p, q, req) {
+    let wns = await this.service.getWatchOrgNodes(p.company_id)
+    return wns
+  }
 
 
-   async refQuery(pobj, qobj, req) {
-    let rtn=await this.service.refQuery(pobj);
+  async refQuery (pobj, qobj, req) {
+    let rtn = await this.service.refQuery(pobj);
     return rtn
     return rtn
   }
   }
-  
+
 }
 }
 module.exports = CompanyCtl;
 module.exports = CompanyCtl;

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

@@ -31,6 +31,32 @@ class CompanyService extends ServiceBase {
       return appids
       return appids
     })
     })
   }
   }
+  buildNoPositionNode (treejson, rtnArray) {
+    treejson.forEach((n) => {
+      if (n.children) {
+        this.buildNoPositionNode(n.children, rtnArray)
+      }
+      if (typeof n.isPosition == "undefined") {
+        rtnArray.push(n)
+      } else {
+        if (!n.isPosition) {
+          rtnArray.push(n)
+        }
+      }
+
+    })
+  }
+  async getWatchOrgNodes (cmid) {
+    let rtn = []
+    let companynew = await this.findById(cmid)
+    let orgjsonstr = companynew.orgJson
+    if (orgjsonstr && orgjsonstr != "") {
+      let treejson = JSON.parse(companynew.orgJson)
+      this.buildNoPositionNode(treejson, rtn)
+    }
+    return rtn
+  }
+
   async setOrgs (p, cmk) {
   async setOrgs (p, cmk) {
     var self = this
     var self = this
     let curNodeData = p.curdata
     let curNodeData = p.curdata