Pre Merge pull request !220 from reset/feature/cl

3 years ago · 68d7a1dbfa
parent 09d624b46b 3eb29f823f
commit 68d7a1dbfa
2 changed files with 2 additions and 2 deletions
--- a/src/com/engine/organization/entity/company/bo/CompBO.java
+++ b/src/com/engine/organization/entity/company/bo/CompBO.java
@ -105,7 +105,7 @@ public class CompBO {
        return comps.stream().map(item -> {
            SearchTree tree = new SearchTree();
            tree.setCanClick(true);
-            tree.setCanceled(false);
+            tree.setCanceled(item.getForbiddenTag() != 0);
            tree.setIcon("icon-coms-LargeArea");
            tree.setId(item.getId().toString());
            tree.setIsParent(false);
--- a/src/com/engine/organization/entity/department/bo/DepartmentBO.java
+++ b/src/com/engine/organization/entity/department/bo/DepartmentBO.java
@ -127,7 +127,7 @@ public class DepartmentBO {
        return departmentPOS.stream().map(item -> {
            SearchTree tree = new SearchTree();
            tree.setCanClick(true);
-            tree.setCanceled(false);
+            tree.setCanceled(item.getForbiddenTag() != 0);
            tree.setIcon(isLeaf ? "icon-coms-Branch" : "icon-coms-LargeArea");
            tree.setId(item.getId().toString());
            tree.setIsParent(false);