From a38c5a2c7d3fa18986a12ab7b664e72b86c68855 Mon Sep 17 00:00:00 2001
From: zer0Black <lxtalx@gmail.com>
Date: Sat, 29 Jul 2023 11:04:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E7=B1=BB=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E7=9A=84=E6=9D=83=E9=99=90=E6=8C=89=E9=92=AE=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SysCategoryController.java     |  2 --
 jero-web/src/views/system/SysCategoryList.vue | 20 ++++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java
index c3b7c02c..6e2f5eb9 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java
@@ -68,10 +68,8 @@ public class SysCategoryController {
 		}
 		Results<IPage<SysCategory>> result = new Results<>();
 
-		//--author:os_chengtgen---date:20190804 -----for: 分类字典页面显示错误,issues:377--------start
 		QueryWrapper<SysCategory> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("pid", sysCategory.getPid());
-		//--author:os_chengtgen---date:20190804 -----for: 分类字典页面显示错误,issues:377--------end
 
 		Page<SysCategory> page = new Page<>(pageNo, pageSize);
 		IPage<SysCategory> pageList = sysCategoryService.page(page, queryWrapper);
diff --git a/jero-web/src/views/system/SysCategoryList.vue b/jero-web/src/views/system/SysCategoryList.vue
index cb4b439d..2b639074 100644
--- a/jero-web/src/views/system/SysCategoryList.vue
+++ b/jero-web/src/views/system/SysCategoryList.vue
@@ -3,12 +3,12 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('分类字典')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"  :action="importExcelUrl" @change="handleImportExcel">
+      <a-button @click="handleAdd" type="primary" icon="plus" v-has="'sys:category:add'">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('分类字典')" v-has="'sys:category:export'">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"  :action="importExcelUrl" @change="handleImportExcel" v-has="'sys:category:import'">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
+      <a-dropdown v-if="selectedRowKeys.length > 0" v-has="'sys:category:del'">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
         </a-menu>
@@ -37,13 +37,15 @@
         v-bind="tableProps">
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-          <a-divider type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record)">
+          <a @click="handleEdit(record)"  v-has="'sys:category:edit'">编辑</a>
+          <!--          修改样式后，去除该分割线-->
+          <a-divider type="vertical" v-has="'sys:category:del'"/>
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record)" v-has="'sys:category:del'">
             <a>删除</a>
           </a-popconfirm>
-          <a-divider type="vertical" />
-          <a @click="handleAddSub(record)">添加下级</a>
+          <!--          修改样式后，去除该分割线-->
+          <a-divider type="vertical" v-has="'sys:category:add'"/>
+          <a @click="handleAddSub(record)" v-has="'sys:category:add'">添加下级</a>
         </span>
 
       </a-table>