From 2e6ae80c0271e5e45faa399ce94cd44678cce43f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 13 八月 2021 22:58:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDisabilityExcelListen.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDisabilityExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDisabilityExcelListen.java
index 0101180..d18840a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDisabilityExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDisabilityExcelListen.java
@@ -131,7 +131,6 @@
vo.setSerialNumber(oneData.get(0));
}
//姓名和身份证都为空,为空户，无需操作,否则就解析年龄，性别，出生年月日
- if(StringUtils.isNotEmpty(oneData.get(1)) || StringUtils.isNotEmpty(oneData.get(2))){
if(StringUtils.isEmpty(oneData.get(1))){
ComMngPopulationDisabilityMistakeExcelVO mistake = new ComMngPopulationDisabilityMistakeExcelVO();
index++;
@@ -178,7 +177,7 @@
}else{
vo.setSex(PopulSexEnum.nv.getCode());
}
- }
+
if(StringUtils.isNotEmpty(oneData.get(3))){
vo.setCertificateSituation(oneData.get(3));
}
--
Gitblit v1.7.1