fix:存在未发布的章节，需要提示出来

controllers/report.go

@@ -1859,9 +1859,9 @@ func (this *ReportController) PublishDayWeekReport() {
 		return
 	}
 
-	tips, err := services.PublishDayWeekReport(reportInfo)
+	tips, err, errMsg := services.PublishDayWeekReport(reportInfo)
 	if err != nil {
-		br.Msg = "发布失败"
+		br.Msg = errMsg
 		br.ErrMsg = "发布晨/周报失败, Err: " + err.Error()
 		return
 	}

services/report.go

@@ -47,7 +47,7 @@ func GetReportContentSub(content string) (contentSub string, err error) {
 }
 
 // PublishDayWeekReport 发布晨周报
-func PublishDayWeekReport(reportInfo *models.Report) (tips string, err error) {
+func PublishDayWeekReport(reportInfo *models.Report) (tips string, err error, errMsg string) {
 	reportId := reportInfo.Id
 	if reportInfo.State == 2 {
 		return
@@ -61,6 +61,7 @@ func PublishDayWeekReport(reportInfo *models.Report) (tips string, err error) {
 	chapterLen := len(chapters)
 	if chapterLen <= 0 {
 		tips = "报告章节为空，不可发布"
+		errMsg = tips
 		err = errors.New(tips)
 		return
 	}
@@ -74,6 +75,7 @@ func PublishDayWeekReport(reportInfo *models.Report) (tips string, err error) {
 	for _, chapter := range chapterList {
 		if chapter.PublishState == 1 {
 			tips = "还存在未发布的章节"
+			errMsg = tips
 			err = errors.New(tips)
 			return
 		}
@@ -206,7 +208,7 @@ func PublishTodayDayReport() (err error) {
 		return
 	}
 	if todayReport != nil {
-		if _, tmpErr := PublishDayWeekReport(todayReport); tmpErr != nil {
+		if _, tmpErr, _ := PublishDayWeekReport(todayReport); tmpErr != nil {
 			err = tmpErr
 			return
 		}

services/report_v2.go

@@ -1040,7 +1040,7 @@ func PublishReport(reportId int, reportUrl string, sysUser *system.Admin) (tips
 
 	// 章节类型的报告（原来的晨周报）
 	if reportInfo.HasChapter == 1 {
-		tips, tmpErr = PublishDayWeekReport(reportInfo)
+		tips, tmpErr, errMsg = PublishDayWeekReport(reportInfo)
 		if tmpErr != nil {
 			err = errors.New("晨周报发布失败, Err:" + tmpErr.Error() + ", report_id:" + strconv.Itoa(reportId))
 		}