diff --git a/maxkey-core/src/main/java/org/maxkey/entity/Organizations.java b/maxkey-core/src/main/java/org/maxkey/entity/Organizations.java index 68bee0171..b45bb6725 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/Organizations.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/Organizations.java @@ -25,6 +25,13 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; import org.apache.mybatis.jpa.persistence.JpaBaseEntity; + +/** + * root organization node,
id = instId or id = parentId or parentId = -1 or parentId = 0 + * @author crystal.sea + * + */ + @Entity @Table(name = "MXK_ORGANIZATIONS") public class Organizations extends JpaBaseEntity implements Serializable { diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/OrganizationsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/OrganizationsController.java index 3025803f4..0ad566914 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/OrganizationsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/OrganizationsController.java @@ -171,7 +171,11 @@ public class OrganizationsController { treeNode.setLeaf(true); treeAttributes.addNode(treeNode); nodeCount ++; - if(org.getId().equalsIgnoreCase(currentUser.getInstId())) { + //root organization node, id = instId or id = parentId or parentId = -1 or parentId = 0 + if(org.getId().equalsIgnoreCase(currentUser.getInstId()) + ||org.getId().equalsIgnoreCase(org.getParentId()) + ||org.getParentId().equalsIgnoreCase("0") + ||org.getParentId().equalsIgnoreCase("-1")) { treeNode.setExpanded(true); treeNode.setLeaf(false); treeAttributes.setRootNode(treeNode);