1
0

marge: 合并代码

This commit is contained in:
TsMask
2024-02-07 12:31:25 +08:00
parent 6d9123314c
commit d5f7a2077e
65 changed files with 2445 additions and 99 deletions

View File

@@ -34,10 +34,10 @@ type SysMenuController struct {
// GET /list
func (s *SysMenuController) List(c *gin.Context) {
query := model.SysMenu{}
if v, ok := c.GetQuery("menuName"); ok {
if v, ok := c.GetQuery("menuName"); ok && v != "" {
query.MenuName = v
}
if v, ok := c.GetQuery("status"); ok {
if v, ok := c.GetQuery("status"); ok && v != "" {
query.Status = v
}
@@ -289,10 +289,10 @@ func (s *SysMenuController) Remove(c *gin.Context) {
// GET /treeSelect
func (s *SysMenuController) TreeSelect(c *gin.Context) {
query := model.SysMenu{}
if v, ok := c.GetQuery("menuName"); ok {
if v, ok := c.GetQuery("menuName"); ok && v != "" {
query.MenuName = v
}
if v, ok := c.GetQuery("status"); ok {
if v, ok := c.GetQuery("status"); ok && v != "" {
query.Status = v
}
@@ -331,10 +331,10 @@ func (s *SysMenuController) RoleMenuTreeSelect(c *gin.Context) {
}
query := model.SysMenu{}
if v, ok := c.GetQuery("menuName"); ok {
if v, ok := c.GetQuery("menuName"); ok && v != "" {
query.MenuName = v
}
if v, ok := c.GetQuery("status"); ok {
if v, ok := c.GetQuery("status"); ok && v != "" {
query.Status = v
}