From b200b681bc401bb11c133a79273ba78cb6ebedf8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 30 七月 2021 18:16:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 e6b1717..ef2cd14 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
@@ -1,5 +1,7 @@
package com.panzhihua.applets.api;
+import com.panzhihua.applets.config.WxMaConfiguration;
+import com.panzhihua.applets.weixin.CheckService;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
@@ -32,14 +34,22 @@
public class DiscussApi extends BaseController {
@Resource
private CommunityService communityService;
+ @Resource
+ private CheckService checkService;
+
@ApiOperation(value = "一起议-新增")
@PostMapping("discuss")
public R addDiscuss(@RequestBody @Validated(AddGroup.class) ComActDiscussDTO comActDiscussDTO) {
+// 微信内容审核
+ String discussSubject = comActDiscussDTO.getDiscussSubject();
+ if (!checkService.checkMessage(discussSubject)) {
+ return R.fail("内容违规");
+ }
Integer type = comActDiscussDTO.getType();
String voteTitle = comActDiscussDTO.getVoteTitle();
- List<String> discussOptions = comActDiscussDTO.getDiscussOptions();
- if (type.intValue()==2 ) {
+ List<ComActDiscussOptionDTO> discussOptions = comActDiscussDTO.getDiscussOptions();
+ if (type.equals(2)) {
if(ObjectUtils.isEmpty(voteTitle)){
return R.fail("投票标题不能为空");
}
@@ -50,6 +60,8 @@
String address = comActDiscussDTO.getAddress();
if (ObjectUtils.isEmpty(address)) {
return R.fail("地址不能为空");
+ }else if(address.contains("null")){
+ comActDiscussDTO.setAddress(null);
}
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long userId = loginUserInfo.getUserId();
--
Gitblit v1.7.1