From 115ba80cfd41258574d0e215e427cb041e21b40f Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期三, 12 五月 2021 10:47:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 eaf79e4..e0da529 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
@@ -177,8 +177,14 @@
if(oneData.get(16) != null){
vo.setWorkCompany(oneData.get(16));
}
- if(oneData.get(17) != null){
- vo.setOutOrLocal(oneData.get(17));
+
+ if(oneData.get(17) != null && StringUtils.isNotEmpty(oneData.get(17))){
+ String outOrLocal = oneData.get(17);
+ if(outOrLocal.equals(ComMngPopulationServeExcelVO.outOrLocal.bd)){
+ vo.setOutOrLocal(1);
+ }else if(outOrLocal.equals(ComMngPopulationServeExcelVO.outOrLocal.wd)){
+ vo.setOutOrLocal(2);
+ }
}
if(oneData.get(18) != null){
vo.setCensusRegister(oneData.get(18));
--
Gitblit v1.7.1