From 3eb186db6cc4ed719d53b32d4d11dbc4a164b178 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Sun, 7 Feb 2021 22:19:20 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90rule=E3=80=91=E6=9B=B4=E6=96=B0UserSel?= =?UTF-8?q?ectTreeNode=E7=9A=84=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roses/kernel/system/pojo/user}/UserSelectTreeNode.java | 2 +- .../kernel/system/modular/user/service/SysUserService.java | 2 +- .../system/modular/user/service/impl/SysUserServiceImpl.java | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) rename {kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/pojo/tree => kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user}/UserSelectTreeNode.java (95%) diff --git a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/pojo/tree/UserSelectTreeNode.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/UserSelectTreeNode.java similarity index 95% rename from kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/pojo/tree/UserSelectTreeNode.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/UserSelectTreeNode.java index 16b4e7f5d..7e9141c37 100644 --- a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/pojo/tree/UserSelectTreeNode.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/UserSelectTreeNode.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.rule.pojo.tree; +package cn.stylefeng.roses.kernel.system.pojo.user; import cn.hutool.core.collection.IterUtil; import cn.stylefeng.roses.kernel.rule.enums.TreeNodeEnum; diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserService.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserService.java index e320df553..3226ba592 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserService.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserService.java @@ -2,10 +2,10 @@ package cn.stylefeng.roses.kernel.system.modular.user.service; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict; -import cn.stylefeng.roses.kernel.rule.pojo.tree.UserSelectTreeNode; import cn.stylefeng.roses.kernel.system.UserServiceApi; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUser; import cn.stylefeng.roses.kernel.system.pojo.user.SysUserResponse; +import cn.stylefeng.roses.kernel.system.pojo.user.UserSelectTreeNode; import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java index c0776d43c..f8dcb807e 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java @@ -19,7 +19,6 @@ import cn.stylefeng.roses.kernel.office.api.pojo.report.ExcelExportParam; import cn.stylefeng.roses.kernel.rule.enums.TreeNodeEnum; import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum; import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict; -import cn.stylefeng.roses.kernel.rule.pojo.tree.UserSelectTreeNode; import cn.stylefeng.roses.kernel.rule.tree.factory.DefaultTreeBuildFactory; import cn.stylefeng.roses.kernel.system.DataScopeApi; import cn.stylefeng.roses.kernel.system.OrganizationServiceApi;