skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/RoleMapper.xml
@@ -26,10 +26,10 @@ <select id="tree" resultMap="treeNodeResultMap"> select id, parent_id, role_name as title, id as "value", id as "key" from blade_role where is_deleted = 0 <if test="param1!=null"> <if test="param1!=null and param1!=''"> and tenant_id = #{param1} </if> <if test="param2!=null"> <if test="param2!=null and param2!=''"> and role_alias <> #{param2} </if> </select> @@ -40,7 +40,7 @@ and ( id = #{_parameter} or parent_id = #{_parameter} or parent_id in ( select b.id from blade_role b where b.is_deleted = 0 and b.PARENT_ID = #{_parameter} ) or role_alias = 'appxczrr' or role_alias = 'gldwzrr' or role_alias = 'jszrr' or role_alias = 'zgbmzrr' or role_alias = 'xzzrr' ) or role_alias like '%zrr' ) </if> ORDER BY sort skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/DeptServiceImpl.java
@@ -88,7 +88,7 @@ @Override public List<DeptVO> treeByParentId(String parentId) { if (AuthUtil.isAdministrator()) { if (AuthUtil.isAdministrator() || AuthUtil.isAdmin()) { return ForestNodeMerger.merge(baseMapper.tree(StringPool.EMPTY)); } return ForestNodeMerger.merge(baseMapper.treeByParentId(parentId)); skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/RoleServiceImpl.java
@@ -81,7 +81,7 @@ @Override public List<RoleVO> treeByParentId(String parentId) { if (AuthUtil.isAdministrator()) { if (AuthUtil.isAdministrator() || AuthUtil.isAdmin()) { return ForestNodeMerger.merge(baseMapper.tree(null, RoleConstant.ADMINISTRATOR)); } return ForestNodeMerger.merge(baseMapper.treeByParentId(parentId));
