QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update:权限表新增区分是否首页显示的标识字段

Browse Source
This commit is contained in:
sunzheng
2024-07-25 14:42:00 +08:00
parent cabe5440d7
commit a3466a1e3b
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-module-system/src/main/java/com/jero/modules/system/entity/SysPermission.java
+7 -1
View File
@@ -167,7 +167,13 @@ public class SysPermission implements Serializable {
private boolean internalOrExternal; private boolean internalOrExternal;
/*update_end author:wuxianquan date:20190908 for:实体增加字段 */ /*update_end author:wuxianquan date:20190908 for:实体增加字段 */
public SysPermission() { /**
* 用于标识是否出现在首页-快捷入口的列表中, 通过是否为null来判断, 具体内容由前端来进行配置
*/
@ApiModelProperty(value = "用于标识是否出现在首页-快捷入口的列表中, 通过是否为null来判断, 具体内容由前端来进行配置")
private String homeIcon;
public SysPermission() {
} }
public SysPermission(boolean index) { public SysPermission(boolean index) {
laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysPermissionMapper.xml
+2 -1
View File
@@ -117,7 +117,8 @@
p.status, p.status,
p.internal_or_external, p.internal_or_external,
p.menu_en, p.menu_en,
p.app_id p.app_id,
p.home_icon
FROM sys_permission p FROM sys_permission p
INNER JOIN sys_permission p2 ON p.parent_id = p2.id INNER JOIN sys_permission p2 ON p.parent_id = p2.id
${ew.customSqlSegment} ${ew.customSqlSegment}
laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeQuickAccessServiceImpl.java
+2 -2
View File
@@ -152,8 +152,8 @@ public class LawsHomeQuickAccessServiceImpl extends ServiceImpl<LawsHomeQuickAcc
List<String> permissionIdList = sysRolePermissionList.stream().map(SysRolePermission::getPermissionId).distinct().collect(Collectors.toList()); List<String> permissionIdList = sysRolePermissionList.stream().map(SysRolePermission::getPermissionId).distinct().collect(Collectors.toList());
sysPermissionList = sysPermissionService.querySecondLevelMenuList(new QueryWrapper<SysPermission>() sysPermissionList = sysPermissionService.querySecondLevelMenuList(new QueryWrapper<SysPermission>()
.in("p.id", permissionIdList) .in("p.id", permissionIdList)
.eq("p.menu_type", 1) .isNotNull("p.home_icon")
.eq("p.hidden", 0) .ne("p.home_icon", "")
.eq(StringUtils.isNotBlank(menuName), "p.name", menuName) .eq(StringUtils.isNotBlank(menuName), "p.name", menuName)
.orderByAsc("p2.sort_no").orderByAsc("p.sort_no")); .orderByAsc("p2.sort_no").orderByAsc("p.sort_no"));
} }