From aad5aa283a2edb413d2e02c0e4daaf4ff4adc32c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Mon, 13 Feb 2023 21:43:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/mixins/header.js                                | 5 +----
 .../views/projectManagement/components/listOfRegulations.vue | 5 ++++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/jero-web/src/mixins/header.js b/jero-web/src/mixins/header.js
index af767cd05..d9fb79333 100644
--- a/jero-web/src/mixins/header.js
+++ b/jero-web/src/mixins/header.js
@@ -46,7 +46,6 @@ const DragHandler = {
     },
 
     handleStart(e) {
-      console.log(e)
       this.dragging = true
       this.removeEvents()
       this.thWidth = this.$el.parentNode.getBoundingClientRect().width
@@ -145,7 +144,7 @@ const ResizeHeaderOne = function(val, name ,minWidths) {
         )
       }
     }
-    console.log(restProps,11)
+
     let className = ''
     if ((restProps.attrs && restProps.attrs.colSpan && restProps.attrs.colSpan == 1) || (restProps.attrs && restProps.attrs.colSpan && restProps.attrs.colSpan > 0)){
       className = ' second'
@@ -160,7 +159,6 @@ const ResizeHeaderOne = function(val, name ,minWidths) {
 export const ResizeHeader = {
   methods: {
     drag(columns, name ,minWidths) {
-      console.log(minWidths)
       return {
         header: {
           // minWidths : 最小宽度 => [[需要设置的列,最小宽],[需要设置的列,最小宽],...]
@@ -238,7 +236,6 @@ export const ResizeColumnProvide = {
   },
   methods: {
     _resizeColumn(w, column) {
-      console.log(column)
       tableAll.forEach(item=>{
         item.forEach((i)=>{
           if(i === column && i.dataIndex === column.dataIndex){
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 9eaaf7b45..0d3a69dbb 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -94,8 +94,8 @@
         </a-row>
       </a-form>
     </div>
+<!--    v-if="(isRoleSwitching && !isDisplay) ||  (!isDisplay && roleSwitchingList.length > 1) || isDisplay"-->
     <div class="table-operator"
-         v-if="(isRoleSwitching && !isDisplay) ||  (!isDisplay && roleSwitchingList.length > 1) || isDisplay"
          style="overflow:hidden;margin-bottom: 20px">
       <div style="float: right;margin-top: 1px; margin-left: 20px">
         <a-popconfirm :visible="customizevisible" overlayClassName='popconfirmmize' placement="bottomRight" >
@@ -1524,6 +1524,9 @@
                 this.isRoleSwitching = false
               }
             }
+            console.log(this.formInlineRoleSwitching.roleSwitchingCode)
+            console.log(this.isRoleSwitching)
+            console.log(this.isDisplay)
             this.getList()
             // this.JLoading = false
           } else {

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

---
 .../head/service/impl/HeadCustomEOServiceImpl.java  | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 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 283c9779c..fe568987f 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
@@ -219,6 +219,7 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
         wrapper.in(HeadCustomEO::getCreateBy, loginUser.getUsername()).in(HeadCustomEO::getModuleFlag, moduleFlag);
         List<HeadCustomEO> list = this.list(wrapper);
         List<HeadCustomVO> headCustomVOOneList = new LinkedList<>();
+        List<HeadCustomVO> res = new ArrayList<>();
         if (ObjectUtils.isNotEmpty(list)) {
             //列表表头一级
             List<HeadCustomEO> oneList = list.stream()
@@ -246,13 +247,11 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
                 getHeadCustomVO(cut, headCustomEO, headCustomVO);
                 headCustomVOOneList.add(headCustomVO);
             }
-        }
-
-        List<HeadCustomVO> res = new ArrayList<>();
-        if ("法规清单".equals(moduleFlag) || "虚拟清单详情".equals(moduleFlag) || "维护清单".equals(moduleFlag)) {
-            res = checkDefaultHead(headCustomVOOneList, cut, moduleFlag);
-        } else {
-            res = headCustomVOOneList;
+            if ("法规清单".equals(moduleFlag) || "虚拟清单详情".equals(moduleFlag) || "维护清单".equals(moduleFlag)) {
+                res = checkDefaultHead(headCustomVOOneList, cut, moduleFlag);
+            } else {
+                res = headCustomVOOneList;
+            }
         }
         return res;
     }