From 2b795b9db6cf8cea652d049085803342880fcdc5 Mon Sep 17 00:00:00 2001 From: kiki1373639299 Date: Tue, 23 Sep 2025 15:17:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?Revert=20"fix:=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=96=B0=E5=BB=BA=E7=A7=9F=E6=88=B7=E7=9A=84=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2=E5=9B=9E=E6=98=BE?= =?UTF-8?q?=E9=94=99=E8=AF=AF"=20=E4=BD=86=E5=9C=A8=E5=AE=9E=E9=99=85?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E4=B8=AD=E5=8F=91=E7=8E=B0=20[=E9=AB=98?= =?UTF-8?q?=E7=89=88=E6=9C=ACmaven=E7=BC=96=E8=AF=91=E6=97=B6=E4=BC=9A?= =?UTF-8?q?=E6=8A=A5=E9=94=99]=EF=BC=8C=20=E5=9B=A0=E6=AD=A4=E5=85=88?= =?UTF-8?q?=E5=9B=9E=E9=80=80=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pom.xml b/pom.xml index ebc8c684..6ebe0813 100644 --- a/pom.xml +++ b/pom.xml @@ -114,12 +114,6 @@ org.apache.maven.plugins maven-compiler-plugin - - - org.projectlombok - lombok - - -parameters From ac2e16c472f19106c99e27e01a62ee067c1db3d0 Mon Sep 17 00:00:00 2001 From: kiki1373639299 Date: Tue, 23 Sep 2025 15:18:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?chore(user):=20=E7=94=A8=E6=88=B7=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=A4=9A=E9=83=A8=E9=97=A8=E5=88=86=E9=9A=94=E7=AC=A6?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=20:=20->=20/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/templates/import/user.xlsx | Bin 11943 -> 11943 bytes .../system/service/impl/UserServiceImpl.java | 14 ++++++-------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/continew-server/src/main/resources/templates/import/user.xlsx b/continew-server/src/main/resources/templates/import/user.xlsx index bfff1337aa663885d3a0af97a5bc122593ab1897..4cbff857e373c99f49a7ffe56e2667c77eee0cf5 100644 GIT binary patch delta 2722 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 diff --git a/continew-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java b/continew-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java index 16c49083..b360b566 100644 --- a/continew-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java +++ b/continew-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java @@ -24,8 +24,6 @@ import cn.hutool.core.io.resource.ResourceUtil; import cn.hutool.core.lang.UUID; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.CharsetUtil; -import java.util.HashMap; -import java.util.Map; import cn.hutool.core.util.EnumUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -790,10 +788,10 @@ public class UserServiceImpl extends BaseServiceImpl * 支持两种格式： *
    - *
  • 多级部门：公司A:研发部:前端组
    • + *
  • 多级部门：公司A/研发部/前端组
    • *
  • 单级部门：研发部
    • *
- * 使用冒号(:)作为层级分隔符，会逐级查找对应的部门 + * 使用左斜杠/作为层级分隔符，会逐级查找对应的部门 *

* * @param deptPath 部门路径 @@ -801,9 +799,9 @@ public class UserServiceImpl extends BaseServiceImpl