|
@@ -661,7 +661,7 @@ func (this *ReportApproveFlowController) ReportClassifyTree() {
|
|
|
}
|
|
|
hasFlowMap := make(map[string]bool)
|
|
|
for _, v := range flows {
|
|
|
- k := fmt.Sprintf("%d-%d-%d", v.ReportType, v.ClassifyFirstId, v.ClassifySecondId)
|
|
|
+ k := fmt.Sprintf("%d-%d-%d-%d", v.ReportType, v.ClassifyFirstId, v.ClassifySecondId, v.ClassifyThirdId)
|
|
|
if k == flowKey {
|
|
|
// 当前审批流对应的分类标记为可选状态
|
|
|
continue
|
|
@@ -688,9 +688,16 @@ func (this *ReportApproveFlowController) ReportClassifyTree() {
|
|
|
}
|
|
|
cnTree = services.GetReportClassifyTreeRecursive(classify, 0)
|
|
|
for _, v := range cnTree {
|
|
|
+ k1 := fmt.Sprintf("%d-%d-%d-%d", report_approve.FlowReportTypeChinese, v.ClassifyId, 0, 0)
|
|
|
+ v.HasFlow = hasFlowMap[k1]
|
|
|
+
|
|
|
for _, v2 := range v.Children {
|
|
|
- k := fmt.Sprintf("%d-%d-%d", report_approve.FlowReportTypeChinese, v.ClassifyId, v2.ClassifyId)
|
|
|
- v2.HasFlow = hasFlowMap[k]
|
|
|
+ k2 := fmt.Sprintf("%d-%d-%d-%d", report_approve.FlowReportTypeChinese, v.ClassifyId, v2.ClassifyId, 0)
|
|
|
+ v2.HasFlow = hasFlowMap[k2]
|
|
|
+ for _, v3 := range v2.Children {
|
|
|
+ k3 := fmt.Sprintf("%d-%d-%d-%d", report_approve.FlowReportTypeChinese, v.ClassifyId, v2.ClassifyId, v3.ClassifyId)
|
|
|
+ v3.HasFlow = hasFlowMap[k3]
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}()
|
|
@@ -709,7 +716,7 @@ func (this *ReportApproveFlowController) ReportClassifyTree() {
|
|
|
enTree = services.GetReportClassifyTreeRecursive(classify, 0)
|
|
|
for _, v := range enTree {
|
|
|
for _, v2 := range v.Children {
|
|
|
- k := fmt.Sprintf("%d-%d-%d", report_approve.FlowReportTypeEnglish, v.ClassifyId, v2.ClassifyId)
|
|
|
+ k := fmt.Sprintf("%d-%d-%d-%d", report_approve.FlowReportTypeEnglish, v.ClassifyId, v2.ClassifyId, 0)
|
|
|
v2.HasFlow = hasFlowMap[k]
|
|
|
}
|
|
|
}
|