From 98541577685c90927d9e130ede6ac120995cb20e Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 9 Jan 2023 11:10:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../head/service/impl/HeadCustomEOServiceImpl.java    | 11 ++++++++++-
 .../java/com/jero/modules/head/vo/HeadCustomVO.java   |  4 +++-
 2 files changed, 13 insertions(+), 2 deletions(-)

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 78a8bd605..b8c2c6bc8 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
@@ -239,7 +239,7 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
 						headCustomVOTwoList.add(headCustomVOTemp);
 					}
 					if(ObjectUtils.isNotEmpty(headCustomVOTwoList)){
-						headCustomVO.setHeadCustomVOList(headCustomVOTwoList);
+						headCustomVO.setChild(headCustomVOTwoList);
 					}
 				}
 				getHeadCustomVO(cut, headCustomEO,headCustomVO);
@@ -257,6 +257,15 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
 		}else{
 			headCustomVO.setTitle(headCustomEO.getHeadFieldEn());
 		}
+		if("编号".equals(headCustomEO.getHeadFieldCn())){
+			headCustomVO.setFixed("left");
+		}
+		if("标题".equals(headCustomEO.getHeadFieldCn())){
+			headCustomVO.setFixed("left");
+		}
+		if("操作".equals(headCustomEO.getHeadFieldCn())){
+			headCustomVO.setFixed("right");
+		}
 		return headCustomVO;
 	}
 }
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 28e134c16..3210fa1de 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
@@ -15,6 +15,8 @@ public class HeadCustomVO {
 
     private String dataIndex;//对应列表字段
 
-    private List<HeadCustomVO> headCustomVOList;//二级表头
+    private String fixed;//字段位置标识
+
+    private List<HeadCustomVO> child;//二级表头
 
 }