From 93e4ecb6fa87a2418937cd2a6e557b0f6314794f Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 26 四月 2022 14:16:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng' into huacheng
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngVolunteerExcelListen.java | 21 ++++++---------------
1 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngVolunteerExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngVolunteerExcelListen.java
index ca64bd4..d537c62 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngVolunteerExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngVolunteerExcelListen.java
@@ -132,25 +132,16 @@
}
}
vo.setIdCard(oneData.get(2).toUpperCase());
- if (StringUtils.isEmpty(oneData.get(3))) {
- index++;
- mistakes.add(setErrorObject(oneData,"志愿者组织不可为空，请填写志愿者组织"));
- continue;
+ if (StringUtils.isNotEmpty(oneData.get(3))) {
+ vo.setOrgName(oneData.get(3));
}
- vo.setOrgName(oneData.get(3));
- if (StringUtils.isEmpty(oneData.get(4))) {
- index++;
- mistakes.add(setErrorObject(oneData,"志愿者队伍不可为空，请填写志愿者队伍"));
- continue;
+ if (StringUtils.isNotEmpty(oneData.get(4))) {
+ vo.setTeamName(oneData.get(4));
}
- vo.setTeamName(oneData.get(4));
- if (StringUtils.isEmpty(oneData.get(5))) {
- index++;
- mistakes.add(setErrorObject(oneData,"志愿者技能不可为空，请填写志愿者技能"));
- continue;
+ if (StringUtils.isNotEmpty(oneData.get(5))) {
+ vo.setSkillName(oneData.get(5));
}
- vo.setSkillName(oneData.get(5));
vo.setIsUniversity(2);
if (StringUtils.isNotEmpty(oneData.get(6))) {
vo.setIsUniversity(1);
--
Gitblit v1.7.1