Merge branch 'bzq/knowledge_add_viewpoint' of eta_gn_server/eta_api into debug

controllers/knowledge/resource.go

@@ -1601,13 +1601,16 @@ func (this *ResourceController) Public() {
 		br.ErrMsg = "获取知识库事件失败，Err:" + err.Error()
 		return
 	}
-	_, err = knowledge_approve.SubmitKnowledgeResourceApprove(obj.KnowledgeResourceId, obj.Title, obj.ClassifyId, sysUser.AdminId, sysUser.RealName)
+	_, msg, err := knowledge_approve.SubmitKnowledgeResourceApprove(obj.KnowledgeResourceId, obj.Title, obj.ClassifyId, sysUser.AdminId, sysUser.RealName)
 	if err != nil {
-		br.Msg = "设置公共失败"
+		if msg == "" {
+			msg = "设置公共失败"
+		}
+		br.Msg = msg
 		br.ErrMsg = "设置公共失败，Err:" + err.Error()
 		return
 	}
-	msg, err := knowledgeSrv.SetKnowledgeResourcePublic(req.KnowledgeResourceId)
+	msg, err = knowledgeSrv.SetKnowledgeResourcePublic(req.KnowledgeResourceId)
 	if err != nil {
 		if msg == "" {
 			msg = "设置公共失败"

services/knowledge/resource.go

@@ -1123,7 +1123,7 @@ func SetKnowledgeResourcePublic(knowledgeId int) (errMsg string, err error) {
 	err = obj.Update([]string{"state", "modify_time"})
 	if err != nil {
 		errMsg = "设置失败"
-		err = fmt.Errorf("设置失败,Err:" + err.Error())
+		err = fmt.Errorf("设置失败,Err:%s", err.Error())
 		return
 	}
 	return

services/knowledge_approve/knowledge_approve.go

@@ -1026,7 +1026,7 @@ func CheckKnowledgeOpenApprove(classifyId int) (opening bool, err error) {
 }
 
 // SubmitKnowledgeResourceApprove 提交审批
-func SubmitKnowledgeResourceApprove(KnowledgeResourceId int, KnowledgeResourceTitle string, classifyId int, sysAdminId int, sysAdminName string) (approveId int, err error) {
+func SubmitKnowledgeResourceApprove(KnowledgeResourceId int, KnowledgeResourceTitle string, classifyId int, sysAdminId int, sysAdminName string) (approveId int, msg string, err error) {
 	// 默认内部审批, 如果是走的第三方审批, 那么仅修改状态
 	// confMap, e := models.GetBusinessConf()
 	// if e != nil {
@@ -1047,6 +1047,10 @@ func SubmitKnowledgeResourceApprove(KnowledgeResourceId int, KnowledgeResourceTi
 	flowPars = append(flowPars, classifyId)
 	flowItem, e := flowOb.GetItemByCondition(flowCond, flowPars, "")
 	if e != nil {
+		if utils.IsErrNoRow(e) {
+			msg = "该分类未设置审批流"
+			return
+		}
 		err = fmt.Errorf("ApproveFlow GetItemByCondition err: %s", e.Error())
 		return
 	}
@@ -1062,6 +1066,7 @@ func SubmitKnowledgeResourceApprove(KnowledgeResourceId int, KnowledgeResourceTi
 		return
 	}
 	if len(nodeItems) == 0 {
+		msg = "无审批节点"
 		err = fmt.Errorf("无审批节点")
 		return
 	}