From a1258c539ec171358c9f6e0c6f689fe725c3f05b Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期四, 23 三月 2023 15:12:33 +0800
Subject: [PATCH] 格式

---
 src/main/java/com/example/jz/controller/WxAppController.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/example/jz/controller/WxAppController.java b/src/main/java/com/example/jz/controller/WxAppController.java
index 1a8fae5..6c9b5bd 100644
--- a/src/main/java/com/example/jz/controller/WxAppController.java
+++ b/src/main/java/com/example/jz/controller/WxAppController.java
@@ -386,6 +386,9 @@
                     if (item.getUserId() != null) {
                         Report report = reportService.getOne(new QueryWrapper<Report>().eq("id", item.getUserId()));
                         User user = userService.getOne(new QueryWrapper<User>().eq("id", report.getUserId()));
+                        if (Objects.isNull(user)) {
+                            return;
+                        }
                         messageMap.put("id", user.getId());
                         messageMap.put("name", item.getReportName());
                         messageMap.put("mobile", user.getUserMobile());
@@ -396,6 +399,9 @@
                     } else {
                         messageMap.put("id", item.getCopId());
                         User user = userService.getOne(new QueryWrapper<User>().eq("id", item.getCopId()));
+                        if (Objects.isNull(user)) {
+                            return;
+                        }
                         messageMap.put("name", user.getRealName());
                         messageMap.put("mobile", user.getUserMobile());
                         messageMap.put("sex", user.getSex());
@@ -549,6 +555,10 @@
         if (StringUtils.isBlank(msg)) {
             return R.failed("msg is blank");
         }
+        GroupUser one = groupUserService.getOne(new LambdaQueryWrapper<GroupUser>().eq(GroupUser::getUserId, id).eq(GroupUser::getGroupId, groupId));
+        if (one.getBanSpeech() == 1){
+            return R.failed("璇ョ敤鎴峰凡缁忚绂佽█");
+        }
         Message message = new Message();
         message.setUserId(id);
         message.setText(msg);
@@ -578,6 +588,8 @@
                     ReportVo reportVo = new ReportVo();
                     BeanUtils.copyProperties(item, reportVo);
                     User user = userDao.selectOne(new LambdaQueryWrapper<User>().eq(User::getId, item.getUserId()));
+                    Cause one = causeService.getOne(new LambdaQueryWrapper<Cause>().eq(Cause::getId, item.getCauseId()));
+                    reportVo.setReportDescription(one.getName());
                     reportVo.setReporterName(user.getRealName());
                     reportVo.setMobile(user.getUserMobile());
                     reportVo.setIdcard(user.getUserIdcard());

--
Gitblit v1.8.0