Merge branch 'bzq/dev' of eta_mini/eta_mini_api into debug

controllers/my_chart.go

@@ -34,7 +34,7 @@ func (this *MyChartController) Collect() {
 		return
 	}
 	user := this.User
-	if user.Status != 2 {
+	if user.Status != utils.UserStatusFormal {
 		br.Msg = "用户没有权限收藏"
 		return
 	}
@@ -102,7 +102,7 @@ func (this *MyChartController) CollectCancel() {
 		return
 	}
 	user := this.User
-	if user.Status != 2 {
+	if user.Status != utils.UserStatusFormal {
 		br.Msg = "用户没有权限收藏"
 		return
 	}
@@ -152,7 +152,7 @@ func (this *MyChartController) List() {
 	}
 
 	user := this.User
-	if user.Status != 2 {
+	if user.Status != utils.UserStatusFormal {
 		br.Msg = "用户没有收藏权限"
 		return
 	}
@@ -316,10 +316,6 @@ func (this *MyChartController) IsCollect() {
 	}
 
 	user := this.User
-	if user.Status != 2 {
-		br.Msg = "用户没有权限收藏"
-		return
-	}
 	count, err := models.GetMyChartCount(user.UserId, req.UniqueCode)
 	if err != nil {
 		br.Msg = "查询收藏数量失败"

controllers/my_report.go

@@ -42,7 +42,7 @@ func (this *MyReportController) List() {
 	if currentIndex <= 0 {
 		currentIndex = 1
 	}
-	if user.Status != 2 {
+	if user.Status != utils.UserStatusFormal {
 		br.Msg = "该用户没有收藏权限"
 		return
 	}
@@ -89,7 +89,7 @@ func (this *MyReportController) Collect() {
 		return
 	}
 	user := this.User
-	if user.Status != 2 {
+	if user.Status != utils.UserStatusFormal {
 		br.Msg = "用户没有权限收藏"
 		return
 	}
@@ -163,7 +163,7 @@ func (this *MyReportController) CollectCancel() {
 		return
 	}
 	user := this.User
-	if user.Status != 2 {
+	if user.Status != utils.UserStatusFormal {
 		br.Msg = "用户没有权限收藏"
 		return
 	}
@@ -208,7 +208,7 @@ func (this *MyReportController) IsCollect() {
 		return
 	}
 	user := this.User
-	if user.Status != 2 {
+	if user.Status != utils.UserStatusFormal {
 		br.Msg = "用户没有权限收藏"
 		return
 	}