From eefc8b7c35151ccb4efd3ba13c333a624baccaca Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期一, 26 七月 2021 15:43:04 +0800
Subject: [PATCH] 基础数据库bug修改

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java
index b68f0ff..bef205c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java
@@ -330,7 +330,6 @@
                     vo.setWorkCompany(oneData.get(24).trim());
                 }
                 if(StringUtils.isNotEmpty(oneData.get(25))){
-                    if (StringUtils.isNotBlank(oneData.get(25).trim())){
                         Integer isOk = PopulOutOrLocalEnum.getCodeByName(oneData.get(25));
                         if(isOk.equals(-1)){
                             ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
@@ -341,9 +340,8 @@
                             continue;
                         }
                         vo.setOutOrLocal(isOk);
-                    }else {
-                        vo.setOutOrLocal(1);
-                    }
+                }else {
+                    vo.setOutOrLocal(1);
                 }
                 if(StringUtils.isNotEmpty(oneData.get(26))){
                     vo.setCensusRegister(oneData.get(26).trim());

--
Gitblit v1.7.1