diff --git a/kernel-s-system/system-business-hr/pom.xml b/kernel-s-system/system-business-hr/pom.xml
index 1b9cec5dc..8e8f528a7 100644
--- a/kernel-s-system/system-business-hr/pom.xml
+++ b/kernel-s-system/system-business-hr/pom.xml
@@ -69,13 +69,6 @@
${roses.version}
-
-
- cn.stylefeng.roses
- office-api
- ${roses.version}
-
-
@@ -125,14 +118,6 @@
spring-boot-starter-web
-
-
-
- cn.stylefeng.roses
- office-spring-boot-starter
- ${roses.version}
-
-
diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUser.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUser.java
index e71aa2c7b..765e1f429 100644
--- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUser.java
+++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUser.java
@@ -25,7 +25,6 @@
package cn.stylefeng.roses.kernel.system.modular.user.entity;
import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity;
-import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -52,105 +51,90 @@ public class SysUser extends BaseEntity {
/**
* 姓名
*/
- @ExcelProperty(value = {"姓名"}, index = 0)
@TableField("real_name")
private String realName;
/**
* 昵称
*/
- @ExcelProperty(value = {"昵称"}, index = 1)
@TableField("nick_name")
private String nickName;
/**
* 账号
*/
- @ExcelProperty(value = {"账号"}, index = 2)
@TableField("account")
private String account;
/**
* 密码
*/
- @ExcelProperty(value = {"密码"}, index = 3)
@TableField("password")
private String password;
/**
* 头像
*/
- @ExcelProperty(value = {"头像"}, index = 4)
@TableField("avatar")
private Long avatar;
/**
* 生日
*/
- @ExcelProperty(value = {"生日"}, index = 5)
@TableField("birthday")
private Date birthday;
/**
* 性别(字典 M男 F女 )
*/
- @ExcelProperty(value = {"性别"}, index = 6)
@TableField("sex")
private String sex;
/**
* 邮箱
*/
- @ExcelProperty(value = {"邮箱"}, index = 7)
@TableField("email")
private String email;
/**
* 手机
*/
- @ExcelProperty(value = {"手机"}, index = 8)
@TableField("phone")
private String phone;
/**
* 电话
*/
- @ExcelProperty(value = {"电话"}, index = 9)
@TableField("tel")
private String tel;
/**
* 是否是超级管理员,超级管理员可以拥有所有权限(Y-是,N-否)
*/
- @ExcelProperty(value = {"是否是超级管理员"}, index = 10)
@TableField("super_admin_flag")
private String superAdminFlag;
/**
* 状态(字典 1正常 2禁用 3冻结)
*/
- @ExcelProperty(value = {"状态"}, index = 11)
@TableField("status_flag")
private Integer statusFlag;
/**
* 最后登陆IP
*/
- @ExcelProperty(value = {"最后登陆IP"}, index = 12)
@TableField("last_login_ip")
private String lastLoginIp;
/**
* 最后登陆时间
*/
- @ExcelProperty(value = {"最后登陆时间"}, index = 13)
@TableField("last_login_time")
private Date lastLoginTime;
/**
* 删除标记(Y-已删除,N-未删除)
*/
- @ExcelProperty(value = {"删除标记"}, index = 14)
@TableField(value = "del_flag", fill = FieldFill.INSERT)
private String delFlag;
diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java
index ac7d673f5..87a724103 100644
--- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java
+++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java
@@ -48,8 +48,6 @@ import cn.stylefeng.roses.kernel.expand.modular.api.ExpandApi;
import cn.stylefeng.roses.kernel.file.api.FileInfoApi;
import cn.stylefeng.roses.kernel.file.api.constants.FileConstants;
import cn.stylefeng.roses.kernel.message.api.expander.WebSocketConfigExpander;
-import cn.stylefeng.roses.kernel.office.api.OfficeExcelApi;
-import cn.stylefeng.roses.kernel.office.api.pojo.report.ExcelExportParam;
import cn.stylefeng.roses.kernel.rule.enums.StatusEnum;
import cn.stylefeng.roses.kernel.rule.enums.TreeNodeEnum;
import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum;
@@ -85,13 +83,12 @@ import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserDataScopeSer
import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserOrgService;
import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserRoleService;
import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserService;
-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.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -126,9 +123,6 @@ public class SysUserServiceImpl extends ServiceImpl impl
@Resource
private SysUserDataScopeService sysUserDataScopeService;
- @Resource
- private OfficeExcelApi officeExcelApi;
-
@Resource
private DataScopeApi dataScopeApi;
@@ -498,16 +492,6 @@ public class SysUserServiceImpl extends ServiceImpl impl
@Override
public void export(HttpServletResponse response) {
- ExcelExportParam excelExportParam = new ExcelExportParam();
- List sysUserList = this.list();
-
- excelExportParam.setClazz(SysUser.class);
- excelExportParam.setDataList(sysUserList);
- excelExportParam.setExcelTypeEnum(ExcelTypeEnum.XLS);
- excelExportParam.setFileName("系统用户导出");
- excelExportParam.setResponse(response);
-
- officeExcelApi.easyExportDownload(excelExportParam);
}
@Override