Skip to content

Commit 58384fe

Browse files
committed
feat: 添加菜单 hiddenFlag 字段,用于管理内部路由
1 parent 3558841 commit 58384fe

3 files changed

Lines changed: 24 additions & 3 deletions

File tree

framework/framework_svc/src/main/java/com/github/cadecode/uniboot/framework/svc/bean/po/SysMenu.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,12 @@ public class SysMenu {
7272
@TableField(typeHandler = BoolToIntTypeHandler.class)
7373
private Boolean enableFlag;
7474

75+
/**
76+
* 是否隐藏(用于内部路由)
77+
*/
78+
@TableField(typeHandler = BoolToIntTypeHandler.class)
79+
private Boolean hiddenFlag;
80+
7581
@TableField(fill = FieldFill.INSERT)
7682
private Date createTime;
7783

framework/framework_svc/src/main/java/com/github/cadecode/uniboot/framework/svc/bean/vo/SysMenuVo.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public static class SysMenuRolesReqVo extends PageParams {
2626
private List<Long> roleIdList;
2727
private Boolean enableFlag;
2828
private Long parentId;
29+
private Boolean hiddenFlag;
2930
}
3031

3132
@Data
@@ -49,7 +50,6 @@ public static class SysMenuUpdateReqVo {
4950
@NotEmpty
5051
private String menuName;
5152
private String icon;
52-
@NotNull
5353
private Integer orderNum;
5454
}
5555

@@ -66,10 +66,11 @@ public static class SysMenuAddReqVo {
6666
@NotNull
6767
private Boolean leafFlag;
6868
private String icon;
69-
@NotNull
7069
private Integer orderNum;
7170
@NotNull
7271
private Boolean enableFlag;
72+
@NotNull
73+
private Boolean hiddenFlag;
7374
}
7475

7576
@Data
@@ -88,6 +89,8 @@ public static class SysMenuTreeResVo {
8889

8990
private Boolean leafFlag;
9091

92+
private Boolean hiddenFlag;
93+
9194
private String icon;
9295

9396
private List<SysMenuTreeResVo> children = new ArrayList<>();
@@ -115,6 +118,8 @@ public static class SysMenuRolesResVo {
115118

116119
private Boolean enableFlag;
117120

121+
private Boolean hiddenFlag;
122+
118123
private List<String> roles;
119124

120125
private Date createTime;

framework/framework_svc/src/main/resources/mapper/SysMenuMapper.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@
5353
<if test="req.enableFlag != null">
5454
AND sm.enable_flag = #{req.enableFlag, typeHandler=BoolToIntTypeHandler}
5555
</if>
56+
<if test="req.hiddenFlag != null">
57+
AND sm.hidden_flag = #{req.hiddenFlag, typeHandler=BoolToIntTypeHandler}
58+
</if>
5659
<if test="req.roleIdList != null and req.roleIdList.size > 0 ">
5760
AND sr.id in (
5861
<foreach collection="req.roleIdList" item="id" separator=",">
@@ -63,7 +66,14 @@
6366
</where>
6467
</if>
6568
GROUP BY sm.id, sm.order_num, sm.create_time
66-
ORDER BY sm.order_num
69+
<choose>
70+
<when test="req.hiddenFlag != null and req.hiddenFlag">
71+
ORDER BY sm.create_time DESC
72+
</when>
73+
<otherwise>
74+
ORDER BY sm.order_num
75+
</otherwise>
76+
</choose>
6777
</select>
6878
<select id="selectRolesVoByMenuIds" resultMap="SysMenuRolesVoMap">
6979
SELECT sm.*, JSON_ARRAYAGG(sr.code) r_code

0 commit comments

Comments
 (0)