diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java index e8b6f8e4e..0a27cffa5 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java @@ -74,7 +74,7 @@ public class ApiIssueController { * @return */ @PostMapping("statement") - public Result statement(@LoginUser TokenDto userDetail, StatementFormDTO formDto) { + public Result statement(@LoginUser TokenDto userDetail, @RequestBody StatementFormDTO formDto) { formDto.setUserId(userDetail.getUserId()); return issueService.statement(formDto); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/EventCommentsFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/EventCommentsFormDTO.java index 76e299b39..ddfe1ccd9 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/EventCommentsFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/EventCommentsFormDTO.java @@ -3,6 +3,7 @@ package com.elink.esua.epdc.dto.comment.form; import lombok.Data; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; /** @@ -17,12 +18,12 @@ public class EventCommentsFormDTO implements Serializable { /** * 页码 */ - @NotBlank(message = "页码不能为空") + @NotNull(message = "页码不能为空") private Integer pageIndex; /** * 页容量 */ - @NotBlank(message = "分页数量不能为空") + @NotNull(message = "分页数量不能为空") private Integer pageSize; /** * 列表类型 0最新;1最热 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/EpdcAppIssueController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/EpdcAppIssueController.java index 5e75d0dd6..2842b0913 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/EpdcAppIssueController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/EpdcAppIssueController.java @@ -65,7 +65,6 @@ public class EpdcAppIssueController { * @Author: liuchuang * @Date: 2019/9/9 11:23 */ - @GetMapping("detail") public Result getIssueDetail(@RequestBody IssueDetailFormDTO formDto) { ValidatorUtils.validateEntity(formDto); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml index acc6aa4b9..35c3e7616 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml @@ -71,7 +71,7 @@ t1.USER_FACE, t1.USER_NAME, t1.LIKE_COUNT, - t1.UN_LIKE_COUNT + t1.UN_LIKE_COUNT, SUM(t1.REPLY_COUNT + t1.LIKE_COUNT + t1.UN_LIKE_COUNT) AS attitudeNum FROM epdc_event_comment t1 @@ -81,7 +81,7 @@ AND ua.USER_ID = #{userId} AND ua.UPDATED_TIME = ( SELECT - MAX( a.update_time ) + MAX( a.updated_time ) FROM epdc_event_comment_user_attitude a WHERE diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml index b06550938..21bdeecd5 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml @@ -241,7 +241,7 @@ AND ua.USER_ID = #{userId} AND ua.UPDATED_TIME = ( SELECT - MAX( a.update_time ) + MAX( a.updated_time ) FROM epdc_event_user_attitude a WHERE