From 2cdbb69378ac6af3786b8800977de437ba53241c Mon Sep 17 00:00:00 2001 From: yanghui <2536613402@qq.com> Date: 星期一, 10 十月 2022 15:47:41 +0800 Subject: [PATCH] Merge branch 'local_20221010' into huacheng_test --- springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingWestApi.java | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingWestApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingWestApi.java index f797e2c..2cc1516 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingWestApi.java +++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingWestApi.java @@ -4,6 +4,8 @@ import javax.annotation.Resource; +import cn.hutool.core.util.StrUtil; +import com.panzhihua.common.constants.Constants; import com.panzhihua.common.interfaces.OperLog; import com.panzhihua.common.model.dtos.common.PageComPbCheckUnitDto; import com.panzhihua.common.model.vos.common.ComPbCheckUnitVo; @@ -199,8 +201,11 @@ public R addActivityinfo(@RequestBody @Validated(AddGroup.class) ComPbActivityDTO comPbActivityDTO) { // 微信内容审核 String msg = comPbActivityDTO.getRichText(); - if (!checkService.checkMessage(msg)) { - return R.fail("内容违规"); + if (StrUtil.isNotBlank(msg)) { + String result = checkService.checkMessageBy(msg, this.getLoginUserInfo().getOpenid(),this.getAppId()); + if (StrUtil.isNotBlank(result)) { + return R.fail(Constants.NOTICE_FAIL, "填写内容存在 " + result + " 违规信息"); + } } LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); Long userId = loginUserInfo.getUserId(); -- Gitblit v1.7.1