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/modle/entity/Cause.java | 1 +
src/main/resources/mapper/ReportDao.xml | 2 +-
src/main/java/com/example/jz/controller/WxAppController.java | 8 ++++++++
src/main/java/com/example/jz/modle/vo/ReportListVo.java | 2 ++
4 files changed, 12 insertions(+), 1 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());
diff --git a/src/main/java/com/example/jz/modle/entity/Cause.java b/src/main/java/com/example/jz/modle/entity/Cause.java
index f9922f6..a55b3c8 100644
--- a/src/main/java/com/example/jz/modle/entity/Cause.java
+++ b/src/main/java/com/example/jz/modle/entity/Cause.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
import java.io.Serializable;
import java.util.Date;
diff --git a/src/main/java/com/example/jz/modle/vo/ReportListVo.java b/src/main/java/com/example/jz/modle/vo/ReportListVo.java
index 5863922..dd96ae4 100644
--- a/src/main/java/com/example/jz/modle/vo/ReportListVo.java
+++ b/src/main/java/com/example/jz/modle/vo/ReportListVo.java
@@ -24,4 +24,6 @@
//鎶ユ浜鸿韩浠借瘉鍙�
private String idcard;
+ private String sex;
+
}
diff --git a/src/main/resources/mapper/ReportDao.xml b/src/main/resources/mapper/ReportDao.xml
index c5917a8..2d24295 100644
--- a/src/main/resources/mapper/ReportDao.xml
+++ b/src/main/resources/mapper/ReportDao.xml
@@ -30,7 +30,7 @@
order by r.ctime DESC
</select>
<select id="getReportListVoById" resultType="com.example.jz.modle.vo.ReportListVo">
- select u.user_mobile mobile, u.user_idcard idcard, u.real_name reporterName, r.*
+ select u.user_mobile mobile, u.user_idcard idcard, u.real_name reporterName, u.sex sex,r.*
from report r
join user u on r.user_id = u.id
where r.id = #{id}
--
Gitblit v1.8.0