marge: 合并代码

src/modules/system/service/sys_config.impl.go

@@ -34,8 +34,8 @@ func (r *SysConfigImpl) SelectConfigList(sysConfig model.SysConfig) []model.SysC
 func (r *SysConfigImpl) SelectConfigValueByKey(configKey string) string {
 	cacheKey := r.getCacheKey(configKey)
 	// 从缓存中读取
-	cacheValue, err := redis.Get("", cacheKey)
-	if cacheValue != "" || err != nil {
+	cacheValue, _ := redis.Get("", cacheKey)
+	if cacheValue != "" {
 		return cacheValue
 	}
 	// 无缓存时读取数据放入缓存中

src/modules/system/service/sys_menu.impl.go

@@ -49,7 +49,17 @@ func (r *SysMenuImpl) SelectMenuTreeByUserId(userId string) []model.SysMenu {
 // SelectMenuTreeSelectByUserId 根据用户ID查询菜单树结构信息
 func (r *SysMenuImpl) SelectMenuTreeSelectByUserId(sysMenu model.SysMenu, userId string) []vo.TreeSelect {
 	sysMenus := r.sysMenuRepository.SelectMenuList(sysMenu, userId)
-	menus := r.parseDataToTree(sysMenus)
+
+	// 过滤旧前端菜单
+	sysMenusF := []model.SysMenu{}
+	for _, v := range sysMenus {
+		if v.Perms == "page" {
+			continue
+		}
+		sysMenusF = append(sysMenusF, v)
+	}
+
+	menus := r.parseDataToTree(sysMenusF)
 	tree := make([]vo.TreeSelect, 0)
 	for _, menu := range menus {
 		tree = append(tree, vo.SysMenuTreeSelect(menu))