Merge remote-tracking branch 'origin/dev'

疯狂的狮子li

2021-07-28 eb2be90e74adfa06ee251f80c08243d0301ce467

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -56,7 +56,7 @@
        {
            SysDept d = (SysDept) it.next();
            if (d.getDeptId().intValue() == deptId
                    || ArrayUtils.contains(StrUtil.split(d.getAncestors(), ","), deptId + ""))
                    || ArrayUtils.contains(StrUtil.splitToArray(d.getAncestors(), ","), deptId + ""))
            {
                it.remove();
            }