diff --git a/rwk-admin/src/main/java/com/rwk/web/controller/ability/RwkStaffInformationController.java b/rwk-admin/src/main/java/com/rwk/web/controller/ability/RwkStaffInformationController.java index 6538531..21aec39 100644 --- a/rwk-admin/src/main/java/com/rwk/web/controller/ability/RwkStaffInformationController.java +++ b/rwk-admin/src/main/java/com/rwk/web/controller/ability/RwkStaffInformationController.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import com.rwk.common.utils.DateUtils; +import com.rwk.common.utils.StringUtils; import com.rwk.system.domain.RwkMeeting; import com.rwk.system.domain.RwkMeetingStaff; import com.rwk.system.service.IRwkMeetingService; @@ -197,18 +198,20 @@ public class RwkStaffInformationController extends BaseController //对数据换行符进行处理 private List> splitConversion(String string){ List> result = new ArrayList<>(); - String[] lines = string.split("\r\n"); - for (String line : lines) { - // 对每一行按空白字符分割,去除前后空格 - String[] parts = line.trim().split("\\s+"); - List lineParts = new ArrayList<>(); - for (String part : parts) { - if (!part.trim().isEmpty()) { - lineParts.add(part.trim()); + if (StringUtils.isNotEmpty(string)){ + String[] lines = string.split("\r\n"); + for (String line : lines) { + // 对每一行按空白字符分割,去除前后空格 + String[] parts = line.trim().split("\\s+"); + List lineParts = new ArrayList<>(); + for (String part : parts) { + if (!part.trim().isEmpty()) { + lineParts.add(part.trim()); + } + } + if (!lineParts.isEmpty()) { + result.add(lineParts); } - } - if (!lineParts.isEmpty()) { - result.add(lineParts); } } return result;