Merge branch 'BI_Dashboard' into dm

controllers/bi_dashboard.go

@@ -802,10 +802,22 @@ func (this *BIDaShboardController) DelDashboardClassify() {
 		return
 	}
 	if len(publicList) > 0 {
-		br.Msg = "该分类下有关联看板，无法删除"
+		br.Msg = "该分类已关联看板，暂不支持删除！"
 		return
 	}
 
+	// 查询是否关联审批流
+	tmp, er := biapprove.GetBiApproveFlowByClassifyId(req.BiDashboardClassifyId)
+	if er != nil && !utils.IsErrNoRow(er) {
+		err = er
+		br.Msg = "查询审批流出错"
+		br.ErrMsg = "查询审批流出错:" + er.Error()
+		return
+	}
+	if tmp.BiApproveFlowId > 0 {
+		br.Msg = "该分类已关联审批流，暂不支持删除！"
+		return
+	}
 
 	err = bi_dashboard.DelBiDashboardClassify(req.BiDashboardClassifyId)
 	if err != nil {