From a824e3b0f4b9f2f1d45f7195eb1fec2a6f5ba2a9 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 16 九月 2021 11:01:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java | 3 ++-
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussDTO.java | 8 ++++++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java
index eb24134..6a96803 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java
@@ -6,6 +6,7 @@
import javax.annotation.Resource;
+import com.panzhihua.common.validated.PutGroup;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
@@ -222,7 +223,7 @@
@ApiOperation(value = "一起议-公布/编辑投票结果")
@PostMapping("discuss/edit-result")
- public R editDiscussResult(@RequestBody ComActDiscussDTO comActDiscussDTO) {
+ public R editDiscussResult(@RequestBody @Validated(PutGroup.class) ComActDiscussDTO comActDiscussDTO) {
comActDiscussDTO.setUserId(this.getUserId());
return communityService.editDiscussResult(comActDiscussDTO);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussDTO.java
index f32e0f7..0f7e50b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussDTO.java
@@ -6,10 +6,12 @@
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.validated.AddGroup;
+import com.panzhihua.common.validated.PutGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -24,6 +26,7 @@
@ApiModel("议事投票新增编辑")
public class ComActDiscussDTO {
@ApiModelProperty("主键")
+ @NotNull(message = "一起议id不能为空", groups = {PutGroup.class})
private Long id;
@ApiModelProperty("主题")
@@ -76,13 +79,14 @@
@ApiModelProperty(value = "每人可投票数")
private Integer count;
- @ApiModelProperty("是否是小程序用户")
+ @ApiModelProperty(value = "是否是小程序用户", hidden = true)
private Boolean isApplets;
- @ApiModelProperty("当前登录用户信息")
+ @ApiModelProperty(value = "当前登录用户信息", hidden = true)
private LoginUserInfoVO loginUserInfo;
@ApiModelProperty("投票结果")
+ @NotBlank(message = "投票结果不能为空", groups = {PutGroup.class})
private String publishResult;
/**
--
Gitblit v1.7.1