浏览代码

优化报告ID校验

xiexiaoyuan 2 年之前
父节点
当前提交
6d6e0e80dd
共有 2 个文件被更改,包括 5 次插入10 次删除
  1. 0 8
      controller/comment/comment.go
  2. 5 2
      services/comment/comment.go

+ 0 - 8
controller/comment/comment.go

@@ -83,10 +83,6 @@ func HotList(c *gin.Context)  {
 			response.Fail("章节ID格式有误", c)
 			response.Fail("章节ID格式有误", c)
 			return
 			return
 		}
 		}
-		if reportId <= 0 {
-			response.Fail("请输入报告ID", c)
-			return
-		}
 	}
 	}
 
 
 	if reqOldReportId != ""{
 	if reqOldReportId != ""{
@@ -103,10 +99,6 @@ func HotList(c *gin.Context)  {
 			response.Fail("章节ID格式有误", c)
 			response.Fail("章节ID格式有误", c)
 			return
 			return
 		}
 		}
-		if oldReportId <= 0 {
-			response.Fail("请输入报告ID", c)
-			return
-		}
 	}
 	}
 
 
 	userinfo := userService.GetInfoByClaims(c)
 	userinfo := userService.GetInfoByClaims(c)

+ 5 - 2
services/comment/comment.go

@@ -44,7 +44,7 @@ func Comment(user user.UserInfo, req reqComment.ReqComment) (ret response.RespCo
 		err = errors.New("请输入报告ID")
 		err = errors.New("请输入报告ID")
 		return
 		return
 	}
 	}
-	if (req.ReportChapterId > 0 && req.ReportId <=0 ) || (req.OldReportChapterId > 0 && req.OldReportId <= 0){
+	if req.ReportId <=0 && req.OldReportId <= 0 {
 		err = errors.New("请输入报告ID")
 		err = errors.New("请输入报告ID")
 		return
 		return
 	}
 	}
@@ -168,7 +168,10 @@ func List(user user.UserInfo,  reportId, reportChapterId, oldReportId, oldReport
 		err = errors.New("请输入报告ID")
 		err = errors.New("请输入报告ID")
 		return
 		return
 	}
 	}
-
+	if reportId <=0 && oldReportId <= 0 {
+		err = errors.New("请输入报告ID")
+		return
+	}
 	//处理老报告, 转化成新报告ID
 	//处理老报告, 转化成新报告ID
 	if  reportId <=0 && reportChapterId <=0 && (oldReportId >0 || oldReportChapterId > 0) {
 	if  reportId <=0 && reportChapterId <=0 && (oldReportId >0 || oldReportChapterId > 0) {
 		reportId, reportChapterId, err, errMsg = services.GetReportIdReportChapterIdByOldReportId(uint64(oldReportId), uint64(oldReportChapterId))
 		reportId, reportChapterId, err, errMsg = services.GetReportIdReportChapterIdByOldReportId(uint64(oldReportId), uint64(oldReportChapterId))