fix

controllers/report_approval.go

@@ -131,7 +131,7 @@ func (this *ReportController) ListReport() {
 	resp.Paging = page
 	resp.List = list
 	br.Ret = 200
-	br.Success = true
+	
 	br.Msg = "获取成功"
 	br.Data = resp
 }
@@ -217,8 +217,13 @@ func (this *ReportController) PublishReport() {
 		}()
 	}
 
+	if req.State == 3 {
+		br.Msg = "驳回成功"
+	} else {
+		br.Msg = "审批通过"
+	}
 	br.Ret = 200
-	br.Success = true
+	
 	br.Msg = "审批成功"
 }
 
@@ -266,7 +271,7 @@ func (this *ReportController) Detail() {
 	item.ContentSub = html.UnescapeString(item.ContentSub)
 
 	br.Ret = 200
-	br.Success = true
+	
 	br.Msg = "获取成功"
 	br.Data = item
 }

controllers/smart_report_approval.go

@@ -34,9 +34,6 @@ type SmartReportController struct {
 func (this *SmartReportController) List() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
@@ -117,7 +114,6 @@ func (this *SmartReportController) List() {
 		page := paging.GetPaging(params.CurrentIndex, params.PageSize, total)
 		resp.Paging = page
 		br.Ret = 200
-		br.Success = true
 		br.Msg = "获取成功"
 		br.Data = resp
 		return
@@ -151,7 +147,6 @@ func (this *SmartReportController) List() {
 	page := paging.GetPaging(params.CurrentIndex, params.PageSize, total)
 	resp.Paging = page
 	br.Ret = 200
-	br.Success = true
 	br.Msg = "获取成功"
 	br.Data = resp
 }
@@ -165,9 +160,6 @@ func (this *SmartReportController) List() {
 func (this *SmartReportController) Detail() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
@@ -199,7 +191,6 @@ func (this *SmartReportController) Detail() {
 	resp := models.FormatSmartReport2Item(item)
 
 	br.Ret = 200
-	br.Success = true
 	br.Msg = "获取成功"
 	br.Data = resp
 }
@@ -213,9 +204,6 @@ func (this *SmartReportController) Detail() {
 func (this *SmartReportController) Publish() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
@@ -286,8 +274,7 @@ func (this *SmartReportController) Publish() {
 	if req.PublishState == models.SmartReportStateRejected {
 		br.Msg = "驳回成功"
 	} else {
-		br.Msg = "审批成功"
+		br.Msg = "审批通过"
 	}
 	br.Ret = 200
-	br.Success = true
 }