diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index 44f9d93b..34093ae6 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -21,10 +21,7 @@ import com.jero.common.system.util.JwtUtil; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.*; import com.jero.modules.base.service.BaseCommonService; -import com.jero.modules.system.entity.SysDepart; -import com.jero.modules.system.entity.SysUser; -import com.jero.modules.system.entity.SysUserDepart; -import com.jero.modules.system.entity.SysUserRole; +import com.jero.modules.system.entity.*; import com.jero.modules.system.model.DepartIdModel; import com.jero.modules.system.model.SysUserSysDepartModel; import com.jero.modules.system.service.ISysDepartService; @@ -558,16 +555,9 @@ public class SysUserController { sysUserExcel.setSalt(salt); String passwordEncode = PasswordUtil.encrypt(sysUserExcel.getUsername(), sysUserExcel.getPassword(), salt); sysUserExcel.setPassword(passwordEncode); - try { - sysUserService.save(sysUserExcel); - successLines++; - } catch (Exception e) { - errorLines++; - String message = e.getMessage().toLowerCase(); - int lineNumber = i + 1; - // 通过索引名判断出错信息 - setErrorMessage(errorMessage, e, message, lineNumber); - } + SuccessAndErrorLines successAndErrorLines = getSuccessAndErrorLines(errorMessage, successLines, errorLines, i, sysUserExcel); + successLines = successAndErrorLines.getSuccessLines(); + errorLines = successAndErrorLines.getErrorLines(); // 批量将部门和用户信息建立关联关系 TODO 错误需修改 String departIds = sysUserExcel.getDepartIds(); saveUser(sysUserExcel, departIds); @@ -587,6 +577,24 @@ public class SysUserController { return ImportExcelUtil.imporReturnRes(errorLines,successLines,errorMessage); } + @NotNull + private SuccessAndErrorLines getSuccessAndErrorLines(List errorMessage, int successLines, int errorLines, int i, SysUser sysUserExcel) { + SuccessAndErrorLines successAndErrorLines = new SuccessAndErrorLines(); + successAndErrorLines.setSuccessLines(successLines); + successAndErrorLines.setErrorLines(errorLines); + try { + sysUserService.save(sysUserExcel); + successAndErrorLines.setSuccessLines(successLines + 1); + } catch (Exception e) { + successAndErrorLines.setErrorLines(errorLines + 1); + String message = e.getMessage().toLowerCase(); + int lineNumber = i + 1; + // 通过索引名判断出错信息 + setErrorMessage(errorMessage, e, message, lineNumber); + } + return successAndErrorLines; + } + private void saveUser(SysUser sysUserExcel, String departIds) { if (StringUtils.isNotBlank(departIds)) { String userId = sysUserExcel.getId();