warrior 1 сар өмнө
parent
commit
cc089b9bc9

+ 5 - 6
projects/textbook/src/modules/nav-province-contact/page-role/page-role.component.ts

@@ -208,11 +208,10 @@ export class PageRoleComponent implements OnInit {
     // if (searchValue && searchValue != undefined) {
     //   query.equalTo('parent', this.tbookSer.profile.user.department?.objectId);
     // }
-    console.log(parent,this.tbookSer.profile.user.department?.parent?.id);
-    if(parent == this.tbookSer.profile.user.department?.parent?.id){
-      query.equalTo('objectId', this.tbookSer.profile.user.department?.id);
-    }
-    if (this.activeDepart) query.notEqualTo('objectId', this.activeDepart?.id);
+    console.log(parent,this.tbookSer.profile.user.department?.parent?.objectId);
+    if(parent == this.tbookSer.profile.user.department?.parent?.objectId){
+      query.equalTo('objectId', this.tbookSer.profile.user.department?.objectId);
+    }else if (this.activeDepart) query.notEqualTo('objectId', this.activeDepart?.id);
     query.limit(100);
     let res = await query.find();
     res.forEach((item) => {
@@ -449,7 +448,7 @@ export class PageRoleComponent implements OnInit {
       this.parentMap = await this.tbookSer.formatNode(
         this.activeDepart.get('parent')?.id
       );
-      console.log(this.activatedNode);
+      // console.log(this.activatedNode?.parentNode?.origin?.parent);
       if (this.activatedNode?.parentNode?.origin?.parent) {
         this.parentList = await this.getDepart(
           this.activatedNode?.parentNode?.origin?.parent