fix:父级分类

controllers/classify.go

@@ -281,6 +281,7 @@ func (this *ClassifyController) Edit() {
 	br.Msg = "修改成功"
 }
 
+// ParentClassify
 // @Title 获取父级分类接口
 // @Description 获取父级分类
 // @Success 200 {object} models.Classify
@@ -291,7 +292,7 @@ func (this *ClassifyController) ParentClassify() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
-	items, err := models.ParentClassify()
+	items, err := models.GetAllClassify()
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + err.Error()
@@ -337,6 +338,8 @@ func (this *ClassifyController) ParentClassify() {
 		})
 	}
 
+	resp = services.GetClassifyTreeRecursive(resp, 0)
+
 	br.Data = resp
 	br.Ret = 200
 	br.Success = true

controllers/report_v2.go

@@ -413,7 +413,7 @@ func (this *ReportController) Add() {
 	item.LastModifyAdminId = sysUser.AdminId
 	item.LastModifyAdminName = sysUser.RealName
 	item.ContentModifyTime = time.Now()
-	item.NeedSplice = 0
+	item.NeedSplice = 1
 	item.ContentStruct = html.EscapeString(req.ContentStruct)
 	item.HeadImg = req.HeadImg
 	item.EndImg = req.EndImg

models/classify.go

@@ -153,8 +153,12 @@ func EditClassify(req *EditClassifyReq) (err error) {
 	return
 }
 
-//获取父级分类
-
+// ParentClassify
+// @Description: 获取父级分类
+// @author: Roc
+// @datetime 2024-06-18 15:03:49
+// @return items []*Classify
+// @return err error
 func ParentClassify() (items []*Classify, err error) {
 	sql := `SELECT * FROM classify WHERE parent_id=0 order by id desc `
 	o := orm.NewOrmUsingDB("rddp")
@@ -203,6 +207,7 @@ type ClassifyItem struct {
 	ClassifyMenuId        int `description:"二级分类-子目录ID"`
 	ClassifyMenuList      []*ClassifyMenu
 	ChartPermissionIdList []int `description:"绑定的权限ID"`
+	Children              []*ClassifyItem
 }
 
 type ClassifyListResp struct {

services/classify.go

@@ -556,3 +556,15 @@ func EditReportClassify(classifyId int, classifyName string, chartPermissionIdLi
 
 	return
 }
+
+// GetClassifyTreeRecursive 递归获取分类树形结构
+func GetClassifyTreeRecursive(list []*models.ClassifyItem, parentId int) []*models.ClassifyItem {
+	res := make([]*models.ClassifyItem, 0)
+	for _, v := range list {
+		if v.ParentId == parentId {
+			v.Children = GetClassifyTreeRecursive(list, v.Id)
+			res = append(res, v)
+		}
+	}
+	return res
+}

services/report.go

@@ -835,7 +835,7 @@ func CreateNewReport(req models.AddReq, adminInfo *system.Admin) (newReportId in
 	item.LastModifyAdminId = adminInfo.AdminId
 	item.LastModifyAdminName = adminInfo.RealName
 	item.ContentModifyTime = time.Now()
-	item.NeedSplice = 0
+	item.NeedSplice = 1
 	item.ContentStruct = html.EscapeString(req.ContentStruct)
 	item.HeadImg = req.HeadImg
 	item.EndImg = req.EndImg