|
@@ -296,12 +296,39 @@ func (this *AiController) DeleteAiSummaryClassify() {
|
|
|
//删除分类
|
|
|
if req.AiSummaryClassifyId > 0 && req.AiSummaryId == 0 {
|
|
|
//判断是否含有纪要
|
|
|
- count, err := ai_summary.GetAiSummaryInfoCountByClassifyId(req.AiSummaryClassifyId)
|
|
|
+ childIds := make([]int, 0)
|
|
|
+ classifyAll, err := ai_summary.GetAiSummaryClassifyAll()
|
|
|
if err != nil && err.Error() != utils.ErrNoRow() {
|
|
|
- br.Msg = "删除失败"
|
|
|
- br.ErrMsg = "判断名称是否已存在失败,Err:" + err.Error()
|
|
|
+ br.Msg = "获取失败"
|
|
|
+ br.ErrMsg = "获取数据失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ classifyAllMap := make(map[int]*ai_summary.AiSummaryClassifyItems)
|
|
|
+ for _, v := range classifyAll {
|
|
|
+ classifyAllMap[v.AiSummaryClassifyId] = v
|
|
|
+ }
|
|
|
+ aiSummaryService.GetSummaryClassifyChildIds(req.AiSummaryClassifyId, classifyAllMap, &childIds)
|
|
|
+ condition := ``
|
|
|
+ pars := make([]interface{}, 0)
|
|
|
+ if len(childIds) > 0 {
|
|
|
+ ids := utils.IntArr2joinString(childIds, ",")
|
|
|
+ condition = ` AND classify_id IN (` + ids + `) `
|
|
|
+ } else {
|
|
|
+ condition = ` AND classify_id = ? `
|
|
|
+ pars = append(pars, req.AiSummaryClassifyId)
|
|
|
+ }
|
|
|
+ count, err := ai_summary.GetSummaryCountByCondition(condition, pars)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "查询失败"
|
|
|
+ br.ErrMsg = "判断分类下是否有纪要失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
+ //count, err := ai_summary.GetAiSummaryInfoCountByClassifyId(req.AiSummaryClassifyId)
|
|
|
+ //if err != nil && err.Error() != utils.ErrNoRow() {
|
|
|
+ // br.Msg = "删除失败"
|
|
|
+ // br.ErrMsg = "判断名称是否已存在失败,Err:" + err.Error()
|
|
|
+ // return
|
|
|
+ //}
|
|
|
|
|
|
if count > 0 {
|
|
|
br.Msg = "该目录下存在纪要,不可删除"
|
|
@@ -837,6 +864,18 @@ func (this *AiController) AiSummaryList() {
|
|
|
}
|
|
|
startSize = paging.StartIndex(currentIndex, pageSize)
|
|
|
|
|
|
+ classifyAll, err := ai_summary.GetAiSummaryClassifyAll()
|
|
|
+ if err != nil && err.Error() != utils.ErrNoRow() {
|
|
|
+ br.Msg = "获取失败"
|
|
|
+ br.ErrMsg = "获取数据失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ classifyAllMap := make(map[int]*ai_summary.AiSummaryClassifyItems)
|
|
|
+ for _, v := range classifyAll {
|
|
|
+ classifyAllMap[v.AiSummaryClassifyId] = v
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
var condition string
|
|
|
var pars []interface{}
|
|
|
|
|
@@ -871,12 +910,15 @@ func (this *AiController) AiSummaryList() {
|
|
|
}
|
|
|
|
|
|
for i, v := range list {
|
|
|
- ids, err := ai_summary.GetAiSummaryAllParentByClassifyId(v.ClassifyId)
|
|
|
- if err != nil {
|
|
|
- br.Msg = "获取父级信息错误!"
|
|
|
- br.ErrMsg = "获取父级信息错误,Err:" + err.Error()
|
|
|
- return
|
|
|
- }
|
|
|
+ parentIds := make([]int, 0)
|
|
|
+ aiSummaryService.GetSummaryParentIds(v.ClassifyId, classifyAllMap, &parentIds)
|
|
|
+ ids := utils.IntArr2joinString(parentIds,",")
|
|
|
+ //ids, err := ai_summary.GetAiSummaryAllParentByClassifyId(v.ClassifyId)
|
|
|
+ //if err != nil {
|
|
|
+ // br.Msg = "获取父级信息错误!"
|
|
|
+ // br.ErrMsg = "获取父级信息错误,Err:" + err.Error()
|
|
|
+ // return
|
|
|
+ //}
|
|
|
list[i].ParentIds = ids
|
|
|
}
|
|
|
resp := new(ai_summary.AiSummaryListResp)
|