From 25945cec9a4d25ad09d7ccb73b1c42c11aa3e8a4 Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期三, 22 三月 2023 16:57:21 +0800
Subject: [PATCH] 2222

---
 src/main/java/com/example/jz/controller/WxAppController.java |    8 ++++++++
 1 files changed, 8 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..c947455 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());
@@ -578,6 +584,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