From c05c66bd8e2a710b4cb3fca032bb53d25ed9829c Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 30 Aug 2021 19:33:55 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=A0=A1=E9=AA=8CExcel=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/SysUserController.java  | 17 ++++---
 .../modules/system/vo/SysUserTemplate.java    | 47 +++++++++++++++++++
 2 files changed, 55 insertions(+), 9 deletions(-)
 create mode 100644 jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysUserTemplate.java

diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
index b7979e52..88d913fe 100644
--- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.base.Joiner;
 import com.jero.common.exception.JeroBootException;
 import com.jero.modules.system.util.UserUtil;
+import com.jero.modules.system.vo.SysUserTemplate;
 import com.jero.modules.system.vo.SysUserVo;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -574,7 +575,7 @@ public class SysUserController {
         ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
         //此处设置的filename无效 ,前端会重更新设置一下
         mv.addObject(NormalExcelConstants.FILE_NAME, "用户导入模板文件");
-        mv.addObject(NormalExcelConstants.CLASS, SysUser.class);
+        mv.addObject(NormalExcelConstants.CLASS, SysUserTemplate.class);
         mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("用户导入模板文件", "用户导入模板文件"));
         mv.addObject(NormalExcelConstants.DATA_LIST, new ArrayList<SysUser>());
         return mv;
@@ -620,19 +621,17 @@ public class SysUserController {
                     String salt = oConvertUtils.randomGen(8);
                     sysUserExcel.setSalt(salt);
                     String passwordEncode = PasswordUtil.encrypt(sysUserExcel.getUsername(), sysUserExcel.getPassword(), salt);
+                    sysUserExcel.setPassword(passwordEncode);
+                    sysUserExcel.setDelFlag(0);
                     try {
                         ValidUtil.validate(sysUserExcel);
+                        //处理邮箱和手机号的加密
+                        UserUtil.encryptUser(sysUserExcel);
+                        sysUserService.save(sysUserExcel);
+                        successLines++;
                     }catch (JeroBootException e) {
                         errorLines++;
                         errorMessage.add("第 " + lineNumber + " 行：" + e.getMessage());
-                    }
-                    sysUserExcel.setPassword(passwordEncode);
-                    //处理邮箱和手机号的加密
-                    UserUtil.encryptUser(sysUserExcel);
-                    sysUserExcel.setDelFlag(0);
-                    try {
-                        sysUserService.save(sysUserExcel);
-                        successLines++;
                     } catch (Exception e) {
                         errorLines++;
                         String message = e.getMessage().toLowerCase();
diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysUserTemplate.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysUserTemplate.java
new file mode 100644
index 00000000..ab1a4958
--- /dev/null
+++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysUserTemplate.java
@@ -0,0 +1,47 @@
+package com.jero.modules.system.vo;
+
+import com.jero.common.aspect.annotation.Dict;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+
+/**
+ * @author liJiaRao
+ * @date 2021-08-30 19:20
+ */
+@Data
+public class SysUserTemplate {
+    /**
+     * 登录账号
+     */
+    @Excel(name = "用户账号", width = 15)
+    private String username;
+
+    /**
+     * 真实姓名
+     */
+    @Excel(name = "用户姓名", width = 15)
+    private String realname;
+
+    /**
+     * 电话
+     */
+    @Excel(name = "手机号", width = 15)
+    private String phone;
+
+    /**
+     * 角色类型
+     */
+    @Excel(name="角色类型",width = 15)
+    private String roleIds;
+
+    /**
+     * 组织机构
+     */
+    @Excel(name="组织机构",width = 15)
+    private String departIds;
+}