fix: 每日咨询-三级分类

controllers/day_new.go

@@ -378,7 +378,7 @@ func (this *DayNewController) AddReport() {
 		}
 	}
 
-	maxStage, err := models.GetEnglishReportStage(dayNewDefault.ClassifyIdFirst, dayNewDefault.ClassifyIdSecond)
+	maxStage, err := models.GetEnglishReportStage(dayNewDefault.ClassifyIdSecond, dayNewDefault.ClassifyIdThird)
 	if err != nil {
 		br.Msg = "期数获取失败！"
 		br.ErrMsg = "期数获取失败，Err:" + err.Error()
@@ -386,11 +386,11 @@ func (this *DayNewController) AddReport() {
 	}
 
 	item := new(models.EnglishReport)
-	item.AddType = 1 //新增方式：1:新增报告，2:继承报告
-	item.ClassifyIdFirst = dayNewDefault.ClassifyIdFirst
-	item.ClassifyNameFirst = dayNewDefault.ClassifyNameFirst
-	item.ClassifyIdSecond = dayNewDefault.ClassifyIdSecond
-	item.ClassifyNameSecond = dayNewDefault.ClassifyNameSecond
+	item.AddType = 1                                      // 新增方式：1:新增报告，2:继承报告
+	item.ClassifyIdFirst = dayNewDefault.ClassifyIdSecond // 报告表中的id_first实际为二级ID
+	item.ClassifyNameFirst = dayNewDefault.ClassifyNameSecond
+	item.ClassifyIdSecond = dayNewDefault.ClassifyIdThird // 报告表中的id_second实际为三级ID
+	item.ClassifyNameSecond = dayNewDefault.ClassifyNameThird
 	item.Title = dayNewDefault.Title
 	item.Abstract = dayNewDefault.Abstract
 	item.Author = dayNewDefault.Author
@@ -433,9 +433,9 @@ func (this *DayNewController) AddReport() {
 	br.Msg = "生成成功"
 }
 
-// List
-// @Title 每日资讯列表
-// @Description 每日资讯列表
+// ReportDefault
+// @Title 转报告默认设置
+// @Description 转报告默认设置
 // @Success 200 {object} models.WeworkMsgListResp
 // @router /day_new/report_default [get]
 func (this *DayNewController) ReportDefault() {
@@ -464,6 +464,8 @@ func (this *DayNewController) ReportDefault() {
 		ClassifyNameFirst:  dayNewDefault.ClassifyNameFirst,
 		ClassifyIdSecond:   dayNewDefault.ClassifyIdSecond,
 		ClassifyNameSecond: dayNewDefault.ClassifyNameSecond,
+		ClassifyIdThird:    dayNewDefault.ClassifyIdThird,
+		ClassifyNameThird:  dayNewDefault.ClassifyNameThird,
 		Title:              dayNewDefault.Title,
 		Abstract:           dayNewDefault.Abstract,
 		Author:             dayNewDefault.Author,
@@ -477,9 +479,10 @@ func (this *DayNewController) ReportDefault() {
 	br.Data = defaultReport
 }
 
-// @Title 新增英文报告接口
-// @Description 新增英文报告接口
-// @Param	request	body day_new.AddEnglishReportReq true "type json string"
+// ReportDefaultSave
+// @Title 保存-转报告默认设置
+// @Description 保存-转报告默认设置
+// @Param	request	body day_new.EnglishReportDefaultSaveReq true "type json string"
 // @Success 200 {object}
 // @router /day_new/report_default/save [post]
 func (this *DayNewController) ReportDefaultSave() {
@@ -533,6 +536,8 @@ func (this *DayNewController) ReportDefaultSave() {
 	item.ClassifyNameFirst = req.ClassifyNameFirst
 	item.ClassifyIdSecond = req.ClassifyIdSecond
 	item.ClassifyNameSecond = req.ClassifyNameSecond
+	item.ClassifyIdThird = req.ClassifyIdThird
+	item.ClassifyNameThird = req.ClassifyNameThird
 	item.Title = req.Title
 	item.Abstract = req.Abstract
 	item.Author = req.Author
@@ -557,7 +562,7 @@ func (this *DayNewController) ReportDefaultSave() {
 		}
 	} else {
 		item.Id = exist.Id
-		ups := []string{"ClassifyIdFirst", "ClassifyNameFirst", "ClassifyIdSecond", "ClassifyNameSecond", "Title", "Abstract", "Author", "Frequency", "Overview", "ModifyTime"}
+		ups := []string{"ClassifyIdFirst", "ClassifyNameFirst", "ClassifyIdSecond", "ClassifyNameSecond", "Title", "Abstract", "Author", "Frequency", "Overview", "ModifyTime", "ClassifyIdThird", "ClassifyNameThird"}
 		err = item.Update(ups)
 		if err != nil {
 			br.Msg = "保存失败"

controllers/english_report/english_classify.go

@@ -2,17 +2,11 @@ package english_report
 
 import (
 	"fmt"
-	"github.com/rdlucklib/rdluck_tools/paging"
 	"hongze/hz_crm_api/models"
 	"hongze/hz_crm_api/utils"
 	"sort"
 )
 
-// EnglishClassifyController 英文分类
-//type EnglishClassifyController struct {
-//	controllers.BaseAuthController
-//}
-
 // ListClassify
 // @Title 获取分类列表
 // @Description 获取分类列表
@@ -28,46 +22,24 @@ func (this *EnglishReportController) ListClassify() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
-	pageSize, _ := this.GetInt("PageSize")
-	currentIndex, _ := this.GetInt("CurrentIndex")
-	keyWord := this.GetString("KeyWord")
 
-	var startSize int
-	if pageSize <= 0 {
-		pageSize = utils.PageSize20
-	}
-	if currentIndex <= 0 {
-		currentIndex = 1
+	keyWord := this.GetString("KeyWord")
+	reqEnabled, _ := this.GetInt("Enabled", -1)
+	enabled := -1
+	if reqEnabled == 1 {
+		enabled = reqEnabled
 	}
-
-	startSize = utils.StartIndex(currentIndex, pageSize)
-
-	page := paging.GetPaging(currentIndex, pageSize, 0)
 	resp := new(models.EnglishClassifyListResp)
 
 	// 处理一级分类分页的情况
-	rootList, err := models.GetEnglishClassifyRootId(startSize, pageSize, keyWord)
+	rootList, err := models.GetEnglishClassifyRootId(keyWord, enabled)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
-	var ids []int
-	var rootIds []int
-	rootMap := make(map[int]struct{}, 0)
-	for _, v := range rootList {
-		rootIds = append(rootIds, v.Id)
-		rootMap[v.Id] = struct{}{}
-	}
-	total, err := models.GetEnglishClassifyListCount(keyWord)
-	if err != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取失败，Err:" + err.Error()
-		return
-	}
-	if total == 0 {
+	if len(rootList) == 0 {
 		resp.List = make([]*models.EnglishClassifyList, 0)
-		resp.Paging = page
 
 		br.Data = resp
 		br.Ret = 200
@@ -75,10 +47,16 @@ func (this *EnglishReportController) ListClassify() {
 		br.Msg = "获取成功"
 		return
 	}
-	page = paging.GetPaging(currentIndex, pageSize, total)
+	var ids []int
+	var rootIds []int
+	rootMap := make(map[int]struct{}, 0)
+	for _, v := range rootList {
+		rootIds = append(rootIds, v.Id)
+		rootMap[v.Id] = struct{}{}
+	}
 
 	//获取相关的分类ID
-	idList, err := models.GetEnglishClassifyListByRootId(rootIds, keyWord)
+	idList, err := models.GetEnglishClassifyListByRootId(rootIds, keyWord, enabled)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + err.Error()
@@ -100,7 +78,7 @@ func (this *EnglishReportController) ListClassify() {
 			}
 			if _, ok := childIdMap[v.Id]; !ok {
 				ids = append(ids, v.Id)
-				childIdMap[v.ParentId] = struct{}{}
+				childIdMap[v.Id] = struct{}{}
 			}
 		}
 		tmpList, err := models.GetEnglishClassifyChildByIds(ids)
@@ -172,350 +150,9 @@ func (this *EnglishReportController) ListClassify() {
 	sort.Sort(sortList)
 
 	resp.List = sortList
-	resp.Paging = page
 
 	br.Data = resp
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"
 }
-
-//// @Title 新增分类
-//// @Description 新增分类接口
-//// @Param   ClassifyName   int  true       "分类名称"
-//// @Param   ParentId   query   int  true       "父级Id 添加父级时为0"
-//// @Param   Sort   query   string  false       "排序"
-//// @Success 200 新增成功
-//// @router /classify/add [get]
-//func (this *EnglishReportController) AddClassify() {
-//	br := new(models.BaseResponse).Init()
-//	defer func() {
-//		this.Data["json"] = br
-//		this.ServeJSON()
-//	}()
-//	classifyName := this.GetString("ClassifyName")
-//	parentId, _ := this.GetInt("ParentId")
-//	classifyType, _ := this.GetInt("ClassifyType", 0)
-//	sort, _ := this.GetInt("Sort")
-//
-//	item := &models.EnglishClassify{
-//		ClassifyName: classifyName,
-//		Sort:         sort,
-//		ParentId:     parentId,
-//		CreateTime:   time.Now(),
-//		ModifyTime:   time.Now(),
-//		ClassifyType: classifyType,
-//		IsShow:       1,
-//	}
-//	counts, err := models.GetEnglishClassifyCountsByName(classifyName, parentId, classifyType)
-//	if err != nil {
-//		br.Msg = "查询失败"
-//		br.ErrMsg = "查询失败,Err:" + err.Error()
-//		return
-//	}
-//	if counts > 0 {
-//		br.Msg = "该名称已存在"
-//		br.ErrMsg = "该名称已存在!"
-//		return
-//	}
-//	_, err = models.AddEnglishClassify(item)
-//	if err != nil {
-//		br.Msg = "保存失败"
-//		br.ErrMsg = "保存失败,Err:" + err.Error()
-//		return
-//	}
-//
-//	br.Ret = 200
-//	br.Success = true
-//	br.Msg = "新增成功"
-//}
-//
-//// @Title 编辑分类
-//// @Description 编辑分类接口
-//// @Param   ClassifyId   int  true       "分类Id"
-//// @Param   ClassifyName   string  true       "分类名称"
-//// @Param   ParentId   query   int  true       "父级Id 添加父级时为0"
-//// @Param   Sort   query   string  false       "排序"
-//// @Success 200 保存成功
-//// @router /classify/edit [get]
-//func (this *EnglishReportController) EditClassify() {
-//	br := new(models.BaseResponse).Init()
-//	defer func() {
-//		this.Data["json"] = br
-//		this.ServeJSON()
-//	}()
-//	classifyId, _ := this.GetInt("ClassifyId")
-//	classifyName := this.GetString("ClassifyName")
-//	parentId, _ := this.GetInt("ParentId")
-//	sort, _ := this.GetInt("Sort")
-//
-//	if parentId == classifyId {
-//		br.Msg = "上级分类不能选择自己"
-//		return
-//	}
-//	if classifyId <= 0 {
-//		br.Msg = "参数错误"
-//		return
-//	}
-//	if classifyName == "" {
-//		br.Msg = "分类名称不可为空"
-//		return
-//	}
-//
-//	oldItem, err := models.GetEnglishReportClassifyById(classifyId)
-//	if err != nil && err.Error() != utils.ErrNoRow() {
-//		br.Msg = "获取信息失败"
-//		br.ErrMsg = "获取信息失败,Err:" + err.Error()
-//		return
-//	}
-//	parent, err := models.GetEnglishReportClassifyById(parentId)
-//	if err != nil && err.Error() != utils.ErrNoRow() {
-//		br.Msg = "获取信息失败"
-//		br.ErrMsg = "获取信息失败,Err:" + err.Error()
-//		return
-//	}
-//
-//	if oldItem.ParentId == 0 && parentId > 0 {
-//		// 一级分类变更为二级分类，禁止
-//		br.Msg = "一级分类不允许更改为二级分类"
-//		return
-//	}
-//
-//	//判断是否已存在同个名称的分类
-//	existItem, e := models.GetEnglishClassifyByClassifyNameParentId(classifyName, parentId, oldItem.ClassifyType)
-//	if e != nil {
-//		if e.Error() != utils.ErrNoRow() {
-//			br.Msg = "查询已存在的分类出错"
-//			br.ErrMsg = "查询已存在的分类出错, Err:" + e.Error()
-//			return
-//		}
-//	}
-//	if e == nil && existItem.Id != oldItem.Id {
-//		br.Msg = "分类名称:" + classifyName + "已存在"
-//		return
-//	}
-//	if err != nil && err.Error() != utils.ErrNoRow() {
-//		br.Msg = "获取信息失败"
-//		br.ErrMsg = "获取信息失败,Err:" + err.Error()
-//		return
-//	}
-//
-//	//oldParentId := item.ParentId
-//	item := &models.EnglishClassify{
-//		Id:           oldItem.Id,
-//		ClassifyName: classifyName,
-//		Sort:         sort,
-//		ParentId:     parentId,
-//		ModifyTime:   time.Now(),
-//		ClassifyType: oldItem.ClassifyType,
-//		IsShow:       1,
-//	}
-//	if oldItem.ClassifyType == 1 {
-//		err = services.UpdateEnglishVideoClassifyId(oldItem, item, parent, classifyId)
-//		if err != nil {
-//			br.Msg = err.Error()
-//			return
-//		}
-//	} else {
-//		// 更新研报里的分类名称
-//		err = services.UpdateEnglishReportClassifyId(oldItem, item, parent, classifyId)
-//		if err != nil {
-//			br.Msg = err.Error()
-//			return
-//		}
-//	}
-//
-//	err = models.ModifyEnglishClassify(item)
-//	if err != nil {
-//		br.Msg = "保存失败"
-//		br.ErrMsg = "保存失败,Err:" + err.Error()
-//		return
-//	}
-//
-//	br.Ret = 200
-//	br.Success = true
-//	br.Msg = "保存成功"
-//}
-//
-//// @Title 删除分类列表
-//// @Description 删除分类列表
-//// @Param   ClassifyId   int  true       "分类名称"
-//// @Param   ParentId   query   int  true   "父级Id"
-//// @Success 200 保存成功
-//// @router /classify/delete [get]
-//func (this *EnglishReportController) DelClassify() {
-//	br := new(models.BaseResponse).Init()
-//	defer func() {
-//		this.Data["json"] = br
-//		this.ServeJSON()
-//	}()
-//	classifyId, _ := this.GetInt("ClassifyId")
-//	//parentId, _ := this.GetInt("ParentId")
-//
-//	classifyInfo, err := models.GetEnglishReportClassifyById(classifyId)
-//	if err != nil {
-//		if err.Error() == utils.ErrNoRow() {
-//			br.Msg = "当前分类不存在"
-//			br.ErrMsg = "当前分类不存在"
-//			return
-//		}
-//		br.Msg = "获取分类信息失败"
-//		br.ErrMsg = "获取分类信息失败，Err:" + err.Error()
-//		return
-//	}
-//
-//	count, err := models.GetEnglishClassifyChildCounts(classifyId)
-//	if err != nil && err.Error() != utils.ErrNoRow() {
-//		br.Msg = "获取信息失败"
-//		br.ErrMsg = "获取失败，Err:" + err.Error()
-//		return
-//	}
-//
-//	if count > 0 {
-//		br.Msg = "请先删除该分类下关联分类"
-//		br.Ret = 403
-//		return
-//	}
-//
-//	if classifyInfo.ClassifyType == 0 {
-//		reportCount, e := models.GetEnglishReportCounts(classifyId, classifyInfo.ParentId)
-//		if e != nil && e.Error() != utils.ErrNoRow() {
-//			br.Msg = "获取信息失败"
-//			br.ErrMsg = "获取失败，Err:" + e.Error()
-//			return
-//		}
-//
-//		if reportCount > 0 {
-//			br.Msg = "该分类有关联报告，不允许删除"
-//			br.Ret = 403
-//			return
-//		}
-//	} else {
-//		videoCount, e := models.GetEnglishVideoCounts(classifyId, classifyInfo.ParentId)
-//		if e != nil && e.Error() != utils.ErrNoRow() {
-//			br.Msg = "获取信息失败"
-//			br.ErrMsg = "获取失败，Err:" + e.Error()
-//			return
-//		}
-//
-//		if videoCount > 0 {
-//			br.Msg = "该分类有关联的路演视频，不允许删除"
-//			br.Ret = 403
-//			return
-//		}
-//	}
-//
-//	if err = models.DeleteEnglishClassify(classifyId); err != nil {
-//		br.Msg = "删除失败"
-//		br.ErrMsg = "删除报告失败, Err: " + err.Error()
-//		return
-//	}
-//
-//	br.Ret = 200
-//	br.Success = true
-//	br.Msg = "删除成功"
-//}
-//
-//// @Title 获取一级分类列表
-//// @Description 获取一级分类列表
-//// @Param   PageSize   query   int  true       "每页数据条数"
-//// @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
-//// @Param   CompanyType   query   string  false       "产品类型，枚举值：'ficc','权益';不传默认返回全部"
-//// @Success 200 {object} models.EnglishClassifyListResp
-//// @router /classify/first/list [get]
-//func (this *EnglishReportController) FistListClassify() {
-//	br := new(models.BaseResponse).Init()
-//	defer func() {
-//		this.Data["json"] = br
-//		this.ServeJSON()
-//	}()
-//	pageSize, _ := this.GetInt("PageSize")
-//	currentIndex, _ := this.GetInt("CurrentIndex")
-//	classifyType, _ := this.GetInt("ClassifyType", 0)
-//
-//	var startSize int
-//	if pageSize <= 0 {
-//		pageSize = utils.PageSize20
-//	}
-//	if currentIndex <= 0 {
-//		currentIndex = 1
-//	}
-//
-//	startSize = utils.StartIndex(currentIndex, pageSize)
-//	list, err := models.GetEnglishFirstClassifyList(classifyType, startSize, pageSize)
-//	if err != nil {
-//		br.Msg = "获取失败"
-//		br.ErrMsg = "获取失败，Err:" + err.Error()
-//		return
-//	}
-//	total, err := models.GetEnglishFirstClassifyListCount(classifyType)
-//	if err != nil {
-//		br.Msg = "获取失败"
-//		br.ErrMsg = "获取失败，Err:" + err.Error()
-//		return
-//	}
-//
-//	page := paging.GetPaging(currentIndex, pageSize, total)
-//	resp := new(models.EnglishClassifyListResp)
-//	resp.List = list
-//	resp.Paging = page
-//
-//	br.Data = resp
-//	br.Ret = 200
-//	br.Success = true
-//	br.Msg = "获取成功"
-//}
-//
-//// PermissionEdit
-//// @Title 编辑品种权限
-//// @Description 编辑品种权限
-//// @Param	request	body models.EnPermissionAddReq true "type json string"
-//// @Success 200 Ret=200 操作成功
-//// @router /permission/edit [post]
-//func (this *EnglishClassifyController) PermissionEdit() {
-//	br := new(models.BaseResponse).Init()
-//	defer func() {
-//		if br.ErrMsg == "" {
-//			br.IsSendEmail = false
-//		}
-//		this.Data["json"] = br
-//		this.ServeJSON()
-//	}()
-//	sysUser := this.SysUser
-//	if sysUser == nil {
-//		br.Msg = "请登录"
-//		br.ErrMsg = "请登录，SysUser Is Empty"
-//		br.Ret = 408
-//		return
-//	}
-//	var req models.EnClassifyPermissionEditReq
-//	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
-//		br.Msg = "参数解析异常！"
-//		br.ErrMsg = "参数解析失败，Err:" + e.Error()
-//		return
-//	}
-//	if req.ClassifyId <= 0 {
-//		br.Msg = "参数有误"
-//		return
-//	}
-//
-//	// 更新品种权限
-//	nowTime := time.Now().Local()
-//	permissions := make([]*models.EnClassifyPermission, 0)
-//	for _, p := range req.EnPermissions {
-//		v := new(models.EnClassifyPermission)
-//		v.EnPermissionId = p
-//		v.EnClassifyId = req.ClassifyId
-//		v.CreateTime = nowTime
-//		permissions = append(permissions, v)
-//	}
-//	if e := models.ClearAndCreateEnClassifyPermissions(req.ClassifyId, permissions); e != nil {
-//		br.Msg = "保存失败"
-//		br.ErrMsg = "更新分类品种权限失败, Err: " + e.Error()
-//		return
-//	}
-//
-//	br.Ret = 200
-//	br.Success = true
-//	br.Msg = "操作成功"
-//}

models/day_new/day_new_default.go

@@ -10,6 +10,8 @@ type DayNewDefault struct {
 	ClassifyNameFirst  string `description:"一级分类名称"`
 	ClassifyIdSecond   int    `description:"二级分类id"`
 	ClassifyNameSecond string `description:"二级分类名称"`
+	ClassifyIdThird    int    `description:"三级分类ID"`
+	ClassifyNameThird  string `description:"三级分类名称"`
 	Title              string `description:"标题"`
 	Abstract           string `description:"摘要"`
 	Author             string `description:"作者"`
@@ -24,6 +26,8 @@ type EnglishReportDefaultSaveReq struct {
 	ClassifyNameFirst  string `description:"一级分类名称"`
 	ClassifyIdSecond   int    `description:"二级分类id"`
 	ClassifyNameSecond string `description:"二级分类名称"`
+	ClassifyIdThird    int    `description:"三级分类ID"`
+	ClassifyNameThird  string `description:"三级分类名称"`
 	Title              string `description:"标题"`
 	Abstract           string `description:"摘要"`
 	Author             string `description:"作者"`
@@ -51,4 +55,4 @@ func (item *DayNewDefault) Update(cols []string) (err error) {
 	o := orm.NewOrm()
 	_, err = o.Update(item, cols...)
 	return
-}
+}

models/day_new/wework_msg.go

@@ -45,7 +45,7 @@ type WeworkMsgListResp struct {
 }
 
 type DeleteWeworkMsgReq struct {
-	MsgId      string `description:"企业微信消息id"`
+	MsgId string `description:"企业微信消息id"`
 }
 
 type EditWeworkMsgContentReq struct {
@@ -59,6 +59,8 @@ type DayNewReportDefaultResp struct {
 	ClassifyNameFirst  string `description:"一级分类名称"`
 	ClassifyIdSecond   int    `description:"二级分类id"`
 	ClassifyNameSecond string `description:"二级分类名称"`
+	ClassifyIdThird    int    `description:"三级分类ID"`
+	ClassifyNameThird  string `description:"三级分类名称"`
 	Title              string `description:"标题"`
 	Abstract           string `description:"摘要"`
 	Author             string `description:"作者"`
@@ -115,7 +117,7 @@ func GetWeworkMsgByConditionLimit(condition string, pars []interface{}, limit in
 	return
 }
 
-func UpdateContentEnByMsgId(contentEn, msgId string) (err error)  {
+func UpdateContentEnByMsgId(contentEn, msgId string) (err error) {
 	o := orm.NewOrm()
 	sql := `UPDATE wework_msg 
 SET modify_time=NOW(), content_en = ?
@@ -126,7 +128,7 @@ WHERE
 }
 
 // DeleteWeworkMsgByMsgId 删除消息
-func DeleteWeworkMsgByMsgId(msgId string) (err error)  {
+func DeleteWeworkMsgByMsgId(msgId string) (err error) {
 	o := orm.NewOrm()
 	sql := `UPDATE wework_msg 
 SET modify_time=NOW(), is_delete = 1
@@ -137,7 +139,7 @@ WHERE
 }
 
 // GetWeworkMsgByMsgId 根据消息Id查询
-func GetWeworkMsgByMsgId(msgId string) (item *WeworkMsg, err error)  {
+func GetWeworkMsgByMsgId(msgId string) (item *WeworkMsg, err error) {
 	o := orm.NewOrm()
 	sql := `select * from wework_msg where msg_id = ?`
 	err = o.Raw(sql, msgId).QueryRow(&item)
@@ -155,14 +157,13 @@ type AddEnglishReportReq struct {
 	Frequency          string `description:"频度"`
 }
 
-
 // UpdateWeworkMsgIsAdd 更新消息状态为已加入报告
-func UpdateWeworkMsgIsAdd(msgIds string, reportId int64) (err error)  {
+func UpdateWeworkMsgIsAdd(msgIds string, reportId int64) (err error) {
 	o := orm.NewOrm()
 	sql := `UPDATE wework_msg 
 SET modify_time=NOW(), is_add = 1, report_id= ?
 WHERE 
-	 msg_id in (`+msgIds+`) and is_delete = 0 and is_add = 0`
+	 msg_id in (` + msgIds + `) and is_delete = 0 and is_add = 0`
 	_, err = o.Raw(sql, reportId).Exec()
 	return
 }
@@ -173,4 +174,4 @@ func GetWeworkMsgReportIdByLimit(limit int) (list []*WeworkMsg, err error) {
 	sql := `SELECT * FROM wework_msg WHERE is_add = 1 and report_id > 0 GROUP BY report_id ORDER BY report_id desc LIMIT ?`
 	_, err = o.Raw(sql, limit).QueryRows(&list)
 	return
-}
+}

models/english_report.go

@@ -2,7 +2,6 @@ package models
 
 import (
 	"github.com/beego/beego/v2/client/orm"
-	"github.com/rdlucklib/rdluck_tools/paging"
 	"hongze/hz_crm_api/utils"
 	"strings"
 	"time"
@@ -108,33 +107,36 @@ type EnglishClassifyList struct {
 	IsShow        int       `description:"是否在小程序显示：1-显示 0-隐藏"`
 	//ClassifyType  int       `description:"分类类型：0英文报告，1英文线上路演"`
 	EnPermissions []int `description:"英文权限IDs"`
+	Enabled       int   `description:"是否可用，1可用，0禁用"`
 	Child         []*EnglishClassifyList
 }
 
 type EnglishClassifyListResp struct {
-	List   []*EnglishClassifyList
-	Paging *paging.PagingItem `description:"分页数据"`
+	List []*EnglishClassifyList
 }
 
 // GetEnglishClassifyRootId 获取一级分类列表
-func GetEnglishClassifyRootId(startSize, pageSize int, keyWord string) (items []*EnglishClassifyList, err error) {
+func GetEnglishClassifyRootId(keyword string, enabled int) (items []*EnglishClassifyList, err error) {
 	sql := ``
 	o := orm.NewOrmUsingDB("rddp")
-	if keyWord != "" {
+	cond := ""
+	if enabled == 1 {
+		cond = " AND enabled=1 "
+	}
+	if keyword != "" {
 		sql = `SELECT * FROM (
 			                   SELECT * FROM english_classify
-                   WHERE parent_id=0 AND classify_name LIKE '%` + keyWord + `%'
+                   WHERE parent_id=0 ` + cond + ` AND classify_name LIKE ? 
                    UNION
                    SELECT * FROM english_classify
                    WHERE id IN(SELECT parent_id FROM english_classify
-                   WHERE parent_id>0 AND classify_name LIKE '%` + keyWord + `%')
+                   WHERE parent_id>0 ` + cond + ` AND classify_name LIKE ? )
                    )AS t
-                   ORDER BY sort ASC,create_time ASC
-                   LIMIT ?,? `
-		_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
+                   ORDER BY sort ASC,create_time ASC`
+		_, err = o.Raw(sql, utils.GetLikeKeyword(keyword), utils.GetLikeKeyword(keyword)).QueryRows(&items)
 	} else {
-		sql = `SELECT * FROM english_classify WHERE parent_id=0 ORDER BY sort ASC,create_time ASC LIMIT ?,? `
-		_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
+		sql = `SELECT * FROM english_classify WHERE parent_id=0 ` + cond + ` ORDER BY sort ASC,create_time ASC `
+		_, err = o.Raw(sql).QueryRows(&items)
 	}
 	return
 }
@@ -160,20 +162,28 @@ func GetEnglishClassifyListCount(keyWord string) (count int, err error) {
 	return
 }
 
-func GetEnglishClassifyListByRootId(rootIds []int, keyWord string) (items []*EnglishClassifyList, err error) {
+func GetEnglishClassifyListByRootId(rootIds []int, keyword string, enabled int) (items []*EnglishClassifyList, err error) {
 	sql := ``
+	pars := make([]interface{}, 0)
+
 	o := orm.NewOrmUsingDB("rddp")
-	if keyWord != "" {
+	cond := ""
+	if enabled == 1 {
+		cond = " AND enabled=1 "
+	}
+	if keyword != "" {
 		sql = `SELECT
 	a.*
 FROM
 	english_classify a
 	LEFT JOIN english_classify b ON a.root_id = b.id
 	LEFT JOIN english_classify c ON a.parent_id = c.id
-	WHERE a.parent_id > 0 and a.classify_name LIKE '%` + keyWord + `%' and a.root_id IN (` + utils.GetOrmInReplace(len(rootIds)) + `)`
-		_, err = o.Raw(sql, rootIds).QueryRows(&items)
+	WHERE a.parent_id>0  ` + cond + ` and a.classify_name LIKE ? and a.root_id IN (` + utils.GetOrmInReplace(len(rootIds)) + `)`
+		pars = append(pars, utils.GetLikeKeyword(keyword))
+		pars = append(pars, rootIds)
+		_, err = o.Raw(sql, pars).QueryRows(&items)
 	} else {
-		sql = `SELECT * FROM english_classify WHERE parent_id > 0 and root_id IN (` + utils.GetOrmInReplace(len(rootIds)) + `) `
+		sql = `SELECT * FROM english_classify WHERE parent_id>0  ` + cond + ` and root_id IN (` + utils.GetOrmInReplace(len(rootIds)) + `) `
 		_, err = o.Raw(sql, rootIds).QueryRows(&items)
 	}
 	return

utils/common.go

@@ -2201,3 +2201,14 @@ func GetLikeKeywordPars(pars []interface{}, keyword string, num int) (newPars []
 	}
 	return
 }
+
+// GetLikeKeyword
+//
+//	@Description: 获取sql查询中的like查询字段
+//	@author: Roc
+//	@datetime2023-10-23 14:46:32
+//	@param keyword string
+//	@return string
+func GetLikeKeyword(keyword string) string {
+	return `%` + keyword + `%`
+}