From 3504521f662b9e3546757f0f7ca3518df1d384cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Tue, 14 Feb 2023 14:09:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=A4=B4?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/HeadCustomEOServiceImpl.java | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 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 fe568987f..56c09a81f 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
@@ -264,7 +264,7 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
         //编号，标题，操作
         boolean hasBH = false;
         boolean hasBT = false;
-        boolean hasCZ = false;
+//        boolean hasCZ = false;
         for (HeadCustomVO hcVO : headCustomVOOneList) {
             if ("编号".equals(hcVO.getTitle()) || "Number".equals(hcVO.getTitle())) {
                 hasBH = true;
@@ -273,7 +273,7 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
                 hasBT = true;
             }
             if ("操作".equals(hcVO.getTitle())) {
-                hasCZ = true;
+                headCustomVOOneList.remove(hcVO);
             }
         }
         if (!hasBH) {
@@ -299,17 +299,17 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
             res.add(bt);
         }
         res.addAll(headCustomVOOneList);
-        if (!hasCZ) {
-            HeadCustomVO cz = new HeadCustomVO();
-            cz.setDataIndex("operation");
-            if (CutEnum.CN.getValue().equals(cut)) {
-                cz.setTitle("操作");
-            } else {
-                cz.setTitle("Operation");
-            }
-            cz.setFixed("right");
-            res.add(cz);
-        }
+//        if (!hasCZ) {
+//            HeadCustomVO cz = new HeadCustomVO();
+//            cz.setDataIndex("operation");
+//            if (CutEnum.CN.getValue().equals(cut)) {
+//                cz.setTitle("操作");
+//            } else {
+//                cz.setTitle("Operation");
+//            }
+//            cz.setFixed("right");
+//            res.add(cz);
+//        }
         return res;
     }
 
@@ -329,9 +329,9 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
             if ("标题".equals(headCustomEO.getHeadFieldCn())) {
                 headCustomVO.setFixed("left");
             }
-            if ("操作".equals(headCustomEO.getHeadFieldCn())) {
-                headCustomVO.setFixed("right");
-            }
+//            if ("操作".equals(headCustomEO.getHeadFieldCn())) {
+//                headCustomVO.setFixed("right");
+//            }
         }
         return headCustomVO;
     }