From c80959a13c7d4c98f7dff8a27eb18c25e626bbbf Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 6 Apr 2023 15:32:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E6=94=B6=E9=9B=86?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95--=E8=A1=A8=E5=A4=B4=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../head/mapper/xml/HeadCustomEOMapper.xml    |  8 +++++++
 .../service/impl/HeadCustomEOServiceImpl.java | 11 +++++++++
 .../jero/modules/head/vo/HeadCustomVO.java    | 23 +++++++++++++++++++
 3 files changed, 42 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/mapper/xml/HeadCustomEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/mapper/xml/HeadCustomEOMapper.xml
index 79e47d03e..b8f40f86b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/mapper/xml/HeadCustomEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/mapper/xml/HeadCustomEOMapper.xml
@@ -14,5 +14,13 @@
         <result column="module_flag" property="moduleFlag" />
         <result column="sort" property="sort" />
         <result column="field" property="field" />
+        <result column="sort_params" property="sortParams" />
+        <result column="click" property="click" />
+        <result column="click1" property="click1" />
+        <result column="click2" property="click2" />
+        <result column="click3" property="click3" />
+        <result column="click4" property="click4" />
+        <result column="click5" property="click5" />
+        <result column="click6" property="click6" />
     </resultMap>
 </mapper>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java
index 0d8c188a7..33af06df3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java
@@ -334,6 +334,17 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
     @NotNull
     private HeadCustomVO getHeadCustomVO(String cut, HeadCustomEO headCustomEO, HeadCustomVO headCustomVO) {
         headCustomVO.setDataIndex(headCustomEO.getField());
+        headCustomVO.setDb_field_name(headCustomEO.getHeadFieldEn());
+        headCustomVO.setDb_field_txt(headCustomEO.getHeadFieldCn());
+        headCustomVO.setSortParams(headCustomEO.getSortParams());
+        headCustomVO.setSort(headCustomEO.getSort());
+        headCustomVO.setClick(headCustomEO.getClick());
+        headCustomVO.setClick1(headCustomEO.getClick1());
+        headCustomVO.setClick2(headCustomEO.getClick2());
+        headCustomVO.setClick3(headCustomEO.getClick3());
+        headCustomVO.setClick4(headCustomEO.getClick4());
+        headCustomVO.setClick5(headCustomEO.getClick5());
+        headCustomVO.setClick6(headCustomEO.getClick6());
         if (CutEnum.CN.getValue().equals(cut)) {
             headCustomVO.setTitle(headCustomEO.getHeadFieldCn());
         } else {
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/vo/HeadCustomVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/vo/HeadCustomVO.java
index a29392850..26976b78d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/vo/HeadCustomVO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/vo/HeadCustomVO.java
@@ -19,4 +19,27 @@ public class HeadCustomVO {
 
     private List<HeadCustomVO> children;//二级表头
 
+    private String sortParams;
+
+    private String sort;
+
+    private String click;
+
+    private String click1;
+
+    private String click2;
+
+    private String click3;
+
+    private String click4;
+
+    private String click5;
+
+    private String click6;
+
+    private String db_field_name;
+
+    private String db_field_txt;
+
+
 }