|
@@ -653,7 +653,7 @@ func (this *ReportApproveFlowController) ReportClassifyTree() {
|
|
|
hasFlowMap[k] = true
|
|
|
}
|
|
|
|
|
|
- resp, cnTree, smartTree, enTree := make([]*report_approve.ReportClassifyTreeItem, 0), make([]*report_approve.ReportClassifyTreeItem, 0), make([]*report_approve.ReportClassifyTreeItem, 0), make([]*report_approve.ReportClassifyTreeItem, 0)
|
|
|
+ resp, cnTree, enTree := make([]*report_approve.ReportClassifyTreeItem, 0), make([]*report_approve.ReportClassifyTreeItem, 0), make([]*report_approve.ReportClassifyTreeItem, 0)
|
|
|
|
|
|
var cnErr, enErr error
|
|
|
wg := sync.WaitGroup{}
|
|
@@ -677,14 +677,6 @@ func (this *ReportApproveFlowController) ReportClassifyTree() {
|
|
|
v2.HasFlow = hasFlowMap[k]
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- smartTree = services.GetReportClassifyTreeRecursive(classify, 0)
|
|
|
- for _, v := range smartTree {
|
|
|
- for _, v2 := range v.Children {
|
|
|
- k := fmt.Sprintf("%d-%d-%d", report_approve.FlowReportTypeSmart, v.ClassifyId, v2.ClassifyId)
|
|
|
- v2.HasFlow = hasFlowMap[k]
|
|
|
- }
|
|
|
- }
|
|
|
}()
|
|
|
|
|
|
// 英文研报分类
|
|
@@ -729,10 +721,6 @@ func (this *ReportApproveFlowController) ReportClassifyTree() {
|
|
|
ClassifyId: report_approve.FlowReportTypeEnglish,
|
|
|
ClassifyName: "English Report",
|
|
|
Children: enTree,
|
|
|
- }, &report_approve.ReportClassifyTreeItem{
|
|
|
- ClassifyId: report_approve.FlowReportTypeSmart,
|
|
|
- ClassifyName: "Smart Report",
|
|
|
- Children: smartTree,
|
|
|
})
|
|
|
} else {
|
|
|
resp = append(resp, &report_approve.ReportClassifyTreeItem{
|
|
@@ -743,14 +731,9 @@ func (this *ReportApproveFlowController) ReportClassifyTree() {
|
|
|
ClassifyId: report_approve.FlowReportTypeEnglish,
|
|
|
ClassifyName: "英文研报",
|
|
|
Children: enTree,
|
|
|
- }, &report_approve.ReportClassifyTreeItem{
|
|
|
- ClassifyId: report_approve.FlowReportTypeSmart,
|
|
|
- ClassifyName: "智能研报",
|
|
|
- Children: smartTree,
|
|
|
})
|
|
|
}
|
|
|
|
|
|
-
|
|
|
br.Data = resp
|
|
|
br.Ret = 200
|
|
|
br.Success = true
|