Merge remote-tracking branch 'origin/dev_2.6.0' into dev_2.6.0

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/sys/controller/NewSysUserController.java

@@ -585,6 +585,12 @@ public class NewSysUserController extends SuperController {
                 .sorted(Comparator.comparing(SysOrg::getIsDept).reversed()) // 按照IS_DEPT降序排序
                 .collect(Collectors.toList());
 
+        if (!"1".equals(isSubordinates)) {
+            childOrgs = childOrgs.stream()
+                    .filter(org -> "1".equals(org.getIsDept()))
+                    .collect(Collectors.toList());
+        }
+
         // 递归处理每个子节点
         for (SysOrg childOrg : childOrgs) {
             NewTreeVo childNewTreeVo = BeanHelper.beanToBean(childOrg, NewTreeVo.class);