From c1f1d586e05a537c1745e6536e4324a2b50e490e Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期五, 27 八月 2021 10:26:50 +0800
Subject: [PATCH] 特殊群体导入取消人员关系限制

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationMajorExcelListen.java |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationMajorExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationMajorExcelListen.java
index 798fee3..9392b57 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationMajorExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationMajorExcelListen.java
@@ -303,16 +303,16 @@
                     vo.setCustodyPerson(oneData.get(18).trim());
                 }
                 if (StringUtils.isNotEmpty(oneData.get(19))) {
-                    Integer isOk = PopulRelationEnum.getCodeByName(oneData.get(19));
-                    if (isOk.equals(-1)) {
-                        index++;
-                        ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
-                        setMistake(oneData, mistake);
-                        mistake.setMistake("您填写的与监护人关系有误");
-                        mistakes.add(mistake);
-                        continue;
-                    }
-                    vo.setCustodyRelation(isOk);
+//                    Integer isOk = PopulRelationEnum.getCodeByName(oneData.get(19));
+//                    if (isOk.equals(-1)) {
+//                        index++;
+//                        ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
+//                        setMistake(oneData, mistake);
+//                        mistake.setMistake("您填写的与监护人关系有误");
+//                        mistakes.add(mistake);
+//                        continue;
+//                    }
+                    vo.setCustodyRelation(oneData.get(19).trim());
                 }
                 if (StringUtils.isNotEmpty(oneData.get(20))) {
                     vo.setCustodyCardNo(oneData.get(20).trim());

--
Gitblit v1.7.1