栏目完善

app/service/admin/cms_service/menu.go

@@ -5,6 +5,8 @@ import (
 	"gfast/app/service/cache_service"
 	"github.com/gogf/gf/errors/gerror"
 	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/text/gstr"
+	"github.com/gogf/gf/util/gconv"
 )
 
 //获取频道列表
@@ -22,7 +24,7 @@ func GetMenuListChannel() (list []*cms_category.Entity, err error) {
 	return
 }
 
-//获取菜单列表
+//获取所有菜单列表
 func GetMenuList() (list []*cms_category.Entity, err error) {
 	cache := cache_service.New()
 	//从缓存获取数据
@@ -68,3 +70,71 @@ func AddSave(req *cms_category.ReqAdd) (id int64, err error) {
 	}
 	return
 }
+
+//修改栏目操作
+func EditSave(req *cms_category.ReqEdit) (id int64, err error) {
+	entity, err := GetMenuInfoById(req.Id)
+	if err != nil {
+		return
+	}
+	if entity == nil {
+		err = gerror.New("栏目信息不存在")
+		return
+	}
+	entity.Id = gconv.Uint64(req.Id)
+	entity.ParentId = req.ParentId
+	entity.CateType = req.CateType
+	entity.Status = req.Status
+	entity.Name = req.Name
+	entity.Description = req.Description
+	entity.SeoTitle = req.InputSeoTitle
+	entity.SeoKeywords = req.InputSeoKeywords
+	entity.SeoDescription = req.InputSeoDescription
+	entity.CateAddress = req.CateAddress
+	entity.CateContent = req.CateContent
+	res, err := entity.Update()
+	if err != nil {
+		g.Log().Error(err)
+		err = gerror.New("修改保存失败")
+		return
+	}
+	id, err = res.RowsAffected()
+	if err != nil {
+		g.Log().Error(err)
+		err = gerror.New("修改保存失败")
+		return
+	}
+	return
+}
+
+//获取搜索栏目结果
+func GetMenuListSearch(req *cms_category.ReqSearchList) (menus []*cms_category.Entity, err error) {
+	menus, err = GetMenuList()
+	if req != nil {
+		searchMenus := make([]*cms_category.Entity, 0, len(menus))
+		if req.Name != "" {
+			for _, entity := range menus {
+				if gstr.Contains(entity.Name, req.Name) {
+					searchMenus = append(searchMenus, entity)
+				}
+			}
+		}
+		menus = searchMenus
+	}
+	return
+}
+
+//根据栏目ID获取栏目信息
+func GetMenuInfoById(id int) (menu *cms_category.Entity, err error) {
+	menus, err := GetMenuList()
+	if err != nil {
+		return
+	}
+	for _, entity := range menus {
+		if entity.Id == gconv.Uint64(id) {
+			menu = entity
+			break
+		}
+	}
+	return
+}

app/service/admin/dict_service/dict_type.go

@@ -81,10 +81,14 @@ func EditSave(req *sys_dict_type.EditReq, userId int) (int64, error) {
 func SelectListByPage(req *sys_dict_type.SelectPageReq) (total, page int, list []*sys_dict_type.Entity, err error) {
 	model := sys_dict_type.Model
 	if req != nil {
-		if req.DictType != "" {
+		if req.DictName != "" {
 			model = model.Where("dict_name like ?", "%"+req.DictName+"%")
 		}
 
+		if req.DictType != "" {
+			model = model.Where("dict_type like ?", "%"+req.DictType+"%")
+		}
+
 		if req.Status != "" {
 			model = model.Where("status = ", gconv.Int(req.Status))
 		}