From fba6a8fe1fb1cc415b2c234ba8277010473e3141 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Wed, 16 Dec 2020 22:57:58 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90system=E3=80=91=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/service/impl/SysUserServiceImpl.java | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) 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 3ecce20ee..5625f5c5c 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 @@ -5,25 +5,6 @@ import cn.hutool.core.collection.ListUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.digest.BCrypt; -import cn.stylefeng.roses.kernel.system.enums.UserStatusEnum; -import cn.stylefeng.roses.kernel.system.exception.SystemModularException; -import cn.stylefeng.roses.kernel.system.exception.enums.DataScopeExceptionEnum; -import cn.stylefeng.roses.kernel.system.exception.enums.SysUserExceptionEnum; -import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUser; -import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserDataScope; -import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserRole; -import cn.stylefeng.roses.kernel.system.modular.user.mapper.SysUserMapper; -import cn.stylefeng.roses.kernel.system.modular.user.pojo.request.SysUserRequest; -import cn.stylefeng.roses.kernel.system.modular.user.pojo.response.SysUserResponse; -import cn.stylefeng.roses.kernel.system.pojo.organization.SysEmployeeRequest; -import cn.stylefeng.roses.kernel.system.pojo.organization.SysEmployeeResponse; -import cn.stylefeng.roses.kernel.system.pojo.user.UserLoginInfoDTO; -import cn.stylefeng.roses.kernel.system.util.DataScopeUtil; -import com.alibaba.excel.support.ExcelTypeEnum; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.stylefeng.roses.kernel.auth.api.expander.AuthConfigExpander; import cn.stylefeng.roses.kernel.auth.api.pojo.login.LoginUser; import cn.stylefeng.roses.kernel.db.api.factory.PageFactory; @@ -36,11 +17,30 @@ import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict; import cn.stylefeng.roses.kernel.system.DataScopeApi; import cn.stylefeng.roses.kernel.system.SysEmployeeApi; import cn.stylefeng.roses.kernel.system.UserServiceApi; +import cn.stylefeng.roses.kernel.system.enums.UserStatusEnum; +import cn.stylefeng.roses.kernel.system.exception.SystemModularException; +import cn.stylefeng.roses.kernel.system.exception.enums.DataScopeExceptionEnum; +import cn.stylefeng.roses.kernel.system.exception.enums.SysUserExceptionEnum; +import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUser; +import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserDataScope; +import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserRole; import cn.stylefeng.roses.kernel.system.modular.user.factory.LoginUserFactory; import cn.stylefeng.roses.kernel.system.modular.user.factory.SysUserFactory; +import cn.stylefeng.roses.kernel.system.modular.user.mapper.SysUserMapper; +import cn.stylefeng.roses.kernel.system.modular.user.pojo.request.SysUserRequest; +import cn.stylefeng.roses.kernel.system.modular.user.pojo.response.SysUserResponse; import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserDataScopeService; import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserRoleService; import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserService; +import cn.stylefeng.roses.kernel.system.pojo.organization.SysEmployeeRequest; +import cn.stylefeng.roses.kernel.system.pojo.organization.SysEmployeeResponse; +import cn.stylefeng.roses.kernel.system.pojo.user.UserLoginInfoDTO; +import cn.stylefeng.roses.kernel.system.util.DataScopeUtil; +import com.alibaba.excel.support.ExcelTypeEnum; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -289,7 +289,7 @@ public class SysUserServiceImpl extends ServiceImpl impl // 获取用户基本信息 SysUser sysUser = this.querySysUser(sysUserRequest); - BeanUtil.copyProperties(sysUser, sysUserRequest); + BeanUtil.copyProperties(sysUser, sysUserResponse); // 获取对应员工信息 List sysEmployeeResponse = sysEmployeeApi.getUserAllEmployee(sysUser.getId());