From 94c816662ea36a58637750029cf5021ececf697f Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 27 Apr 2022 16:23:05 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=AD=90=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/dto/result/OptionResultDTO.java     | 20 +++++++++++++++++++
 .../impl/IcResiUserImportServiceImpl.java     | 19 ++----------------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java
index 4226c2acac..739d44fc00 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java
@@ -1,9 +1,11 @@
 package com.epmet.commons.tools.dto.result;
 
 import lombok.Data;
+import org.apache.commons.collections4.CollectionUtils;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description
@@ -21,4 +23,22 @@ public class OptionResultDTO implements Serializable {
     private List<OptionResultDTO> children;
     private Boolean usableFlag;
     private String type;
+
+
+    /**
+     * desc:递归获取当前节点的 所有子节点
+     *
+     * @param option
+     * @param resultMap
+     */
+    public void getCurrenNodeAllChild(OptionResultDTO option, Map<String, OptionResultDTO> resultMap) {
+        resultMap.put(option.getValue(), option);
+        if (CollectionUtils.isNotEmpty(option.getChildren())) {
+            return;
+        }
+        option.getChildren().forEach(o -> {
+            resultMap.put(o.getValue(), o);
+            getCurrenNodeAllChild(o, resultMap);
+        });
+    }
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
index 5596554999..51074aac3e 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
@@ -1289,27 +1289,12 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
         if (options == null) {
             return null;
         }
+        //结果平铺展开
         Map<String, OptionResultDTO> resultMap = new HashMap<>();
-        options.forEach(option-> getChildren(option,resultMap));
+        options.forEach(option-> option.getCurrenNodeAllChild(option,resultMap));
         return resultMap;
     }
 
-    /**
-     * desc:递归获取children
-     * @param option
-     * @param resultMap
-     * todo 利用泛型 提取到公共类中
-     */
-    public void getChildren(OptionResultDTO option, Map<String, OptionResultDTO> resultMap) {
-        resultMap.put(option.getValue(),option);
-        if (CollectionUtils.isNotEmpty(option.getChildren())){
-            option.getChildren().forEach(o->{
-                resultMap.put(o.getValue(),o);
-                getChildren(o,resultMap);
-            });
-        }
-    }
-
     /**
      * 更新主表中人员类别标记
      * @param icResiUserTableEnum

From 0ff35b0a2a6da51ea383940185f7f545274798b3 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Wed, 27 Apr 2022 16:51:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E6=A8=A1=E6=9D=BF=E5=88=97=E8=A1=A8=E5=8F=8A=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IcExportTemplateDao.xml            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml
index a299cd8865..5abc391d2a 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml
@@ -53,6 +53,7 @@
             ic_export_template_config
         where DEL_FLAG = 0
             and TEMP_ID = #{tempId}
+            and PID = '0'
         order by SORT
     </select>