From f6760448428b0a11aebab4ee281023532e4f61d7 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 27 十月 2025 19:53:56 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index 94295e0..bf43fe2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -1,4 +1,5 @@
package com.ruoyi.web.controller.system;
+import java.util.Date;
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.ExcelImportUtil;
@@ -236,7 +237,39 @@
Map<String, TDept> deptMap = tDeptService.list().stream().collect(Collectors.toMap(TDept::getDeptName, e -> e));
Map<String, SysRole> roleMap = roleService.selectRoleAll().stream().collect(Collectors.toMap(SysRole::getRoleName, e -> e));
for (EmployeeImportExcel employeeExcel : employeeExcelList) {
- try {
+ EmployeeImportExcel employeeImportExcel = new EmployeeImportExcel();
+ String nickName = employeeImportExcel.getNickName();
+ String sex = employeeImportExcel.getSex();
+ String idCard = employeeImportExcel.getIdCard();
+ Integer age = employeeImportExcel.getAge();
+ String politicalOutlook = employeeImportExcel.getPoliticalOutlook();
+ Date participationTime = employeeImportExcel.getParticipationTime();
+ Date companyTime = employeeImportExcel.getCompanyTime();
+ String firstDegree = employeeImportExcel.getFirstDegree();
+ String firstCollege = employeeImportExcel.getFirstCollege();
+ String firstMajor = employeeImportExcel.getFirstMajor();
+ String highestDegree = employeeImportExcel.getHighestDegree();
+ String highestCollege = employeeImportExcel.getHighestCollege();
+ String highestMajor = employeeImportExcel.getHighestMajor();
+ String department = employeeImportExcel.getDepartment();
+ String position = employeeImportExcel.getPosition();
+ Date positionTime = employeeImportExcel.getPositionTime();
+ String phoneNumber = employeeImportExcel.getPhoneNumber();
+ String organization = employeeImportExcel.getOrganization();
+ String roleName = employeeImportExcel.getRoleName();
+ if (!StringUtils.isEmpty(nickName)
+ &&!StringUtils.isEmpty(sex)
+ &&!StringUtils.isEmpty(idCard)
+ &&!StringUtils.isEmpty(phoneNumber)
+ &&!StringUtils.isEmpty(organization)
+ &&!StringUtils.isEmpty(roleName)
+ &&!StringUtils.isEmpty(department)
+ &&!StringUtils.isEmpty(highestCollege)
+ ){
+ // 到最后一行了
+ break;
+ }
+ try {
// 数据验证
if (StringUtils.isEmpty(employeeExcel.getNickName())) {
errorMessages.add("第" + (successCount + failCount + 1) + "行：姓名为空");
--
Gitblit v1.7.1