From 56b7035bc48de7c58d7aa9fa26c74bd7b1c288f9 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 28 Sep 2021 13:54:58 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=95=B0=E6=8D=AE=E6=8A=A5=E9=94=99=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/jero/common/util/ImportExcelUtil.java | 6 +++---
 .../jero/modules/system/controller/SysUserController.java   | 2 ++
 .../main/java/com/jero/modules/system/entity/SysUser.java   | 1 +
 .../modules/system/service/impl/SysRoleServiceImpl.java     | 1 +
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ImportExcelUtil.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ImportExcelUtil.java
index c1d03c8f..9f90706f 100644
--- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ImportExcelUtil.java
+++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ImportExcelUtil.java
@@ -2,10 +2,12 @@ package com.jero.common.util;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.common.exception.JeroBootException;
 import lombok.extern.slf4j.Slf4j;
 import com.jero.common.api.vo.Result;
 import com.jero.common.constant.CommonConstant;
 
+import javax.management.remote.JMXProviderException;
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
@@ -31,9 +33,7 @@ public class ImportExcelUtil {
             //String fileName = fileUrl.substring(lastIndex + 1);
             //result.put("fileUrl", "/sys/common/static/" + fileUrl);
             //result.put("fileName", fileName);
-            Result<JSONObject> res = Result.OK(result);
-            res.setMessage("文件导入成功，但有错误。\n"+"总上传行数：" + totalCount + "，已导入行数：" + successLines + "，错误次数：" + errorLines +"，错误信息：" +errorMessage);
-            return res;
+            throw new JeroBootException("文件导入失败："+errorMessage);
         }
     }
 
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 fee0b16d..a89b9f69 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
@@ -42,6 +42,7 @@ import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -66,6 +67,7 @@ import java.util.stream.Collectors;
 @Slf4j
 @RestController
 @RequestMapping("/sys/user")
+@Transactional(rollbackFor = Exception.class)
 public class SysUserController {
 	@Autowired
 	private ISysBaseAPI sysBaseAPI;
diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java
index d91ab01e..2d97aa85 100644
--- a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java
+++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java
@@ -117,6 +117,7 @@ public class SysUser implements Serializable {
     /**
      * 状态(1：正常  2：冻结 ）
      */
+    @Excel(name = "状态", width = 15,dicCode = "user_status")
     @Dict(dicCode = "user_status")
     private Integer status;
 
diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysRoleServiceImpl.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysRoleServiceImpl.java
index 0baec707..e4c0ca4c 100644
--- a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysRoleServiceImpl.java
+++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysRoleServiceImpl.java
@@ -33,6 +33,7 @@ import java.util.List;
  * @since 2018-12-19
  */
 @Service
+@Transactional(rollbackFor = Exception.class)
 public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> implements ISysRoleService {
     @Autowired
     SysRoleMapper sysRoleMapper;