From a582839c97b0b5ed9af0399560a82d3aab6e74ea Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期二, 20 七月 2021 14:08:54 +0800
Subject: [PATCH] 社区后台基础数据库bug修改

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationConfirmServeExcelListen.java |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationConfirmServeExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationConfirmServeExcelListen.java
index 088ab42..ed4feff 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationConfirmServeExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationConfirmServeExcelListen.java
@@ -196,12 +196,13 @@
                     Integer isOk = PopulRelationEnum.getCodeByName(oneData.get(5));
                     if (isOk.equals(-1)) {
 //                        vo.setMarriageStr(ma);
-                        ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
-                        importErrorVO.setErrorPosition("第" + index + "行,第6列");
-                        importErrorVO.setErrorMsg("您填写的与户主关系有误");
-                        populationImportErrorVOList.add(importErrorVO);
-                        index++;
-                        continue;
+//                        ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+//                        importErrorVO.setErrorPosition("第" + index + "行,第6列");
+//                        importErrorVO.setErrorMsg("您填写的与户主关系有误");
+//                        populationImportErrorVOList.add(importErrorVO);
+//                        index++;
+//                        continue;
+                        vo.setRelation(6);
                     } else {
                         vo.setRelation(isOk);
                     }

--
Gitblit v1.7.1