From a3466a1e3b57d20ad780f37139b2b5f8bdaae6cf Mon Sep 17 00:00:00 2001 From: sunzheng Date: Thu, 25 Jul 2024 14:42:00 +0800 Subject: [PATCH] =?UTF-8?q?update:=E6=9D=83=E9=99=90=E8=A1=A8=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=8C=BA=E5=88=86=E6=98=AF=E5=90=A6=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E6=A0=87=E8=AF=86=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/system/entity/SysPermission.java | 8 +++++++- .../modules/system/mapper/xml/SysPermissionMapper.xml | 3 ++- .../home/service/impl/LawsHomeQuickAccessServiceImpl.java | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/laws-module-system/src/main/java/com/jero/modules/system/entity/SysPermission.java b/laws-module-system/src/main/java/com/jero/modules/system/entity/SysPermission.java index 83e9f8f5..8ac6b6ff 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/entity/SysPermission.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/entity/SysPermission.java @@ -167,7 +167,13 @@ public class SysPermission implements Serializable { private boolean internalOrExternal; /*update_end author:wuxianquan date:20190908 for:实体增加字段 */ - public SysPermission() { + /** + * 用于标识是否出现在首页-快捷入口的列表中, 通过是否为null来判断, 具体内容由前端来进行配置 + */ + @ApiModelProperty(value = "用于标识是否出现在首页-快捷入口的列表中, 通过是否为null来判断, 具体内容由前端来进行配置") + private String homeIcon; + + public SysPermission() { } public SysPermission(boolean index) { diff --git a/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysPermissionMapper.xml b/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysPermissionMapper.xml index 8ccf43e3..75364f19 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysPermissionMapper.xml +++ b/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysPermissionMapper.xml @@ -117,7 +117,8 @@ p.status, p.internal_or_external, p.menu_en, - p.app_id + p.app_id, + p.home_icon FROM sys_permission p INNER JOIN sys_permission p2 ON p.parent_id = p2.id ${ew.customSqlSegment} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeQuickAccessServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeQuickAccessServiceImpl.java index 990748e9..0715a8de 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeQuickAccessServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeQuickAccessServiceImpl.java @@ -152,8 +152,8 @@ public class LawsHomeQuickAccessServiceImpl extends ServiceImpl permissionIdList = sysRolePermissionList.stream().map(SysRolePermission::getPermissionId).distinct().collect(Collectors.toList()); sysPermissionList = sysPermissionService.querySecondLevelMenuList(new QueryWrapper() .in("p.id", permissionIdList) - .eq("p.menu_type", 1) - .eq("p.hidden", 0) + .isNotNull("p.home_icon") + .ne("p.home_icon", "") .eq(StringUtils.isNotBlank(menuName), "p.name", menuName) .orderByAsc("p2.sort_no").orderByAsc("p.sort_no")); }