From 56eba9cded865648465bc2c5815d47441e0457b1 Mon Sep 17 00:00:00 2001
From: sxq <812980466@qq.com>
Date: 星期二, 22 六月 2021 15:35:52 +0800
Subject: [PATCH] Merge branch 'dev' of D:\idea\RuoYi-Vue-Plus with conflicts.
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
index c3fdf83..ab39319 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
+++ b/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();
}
--
Gitblit v1.9.3