From c57421925562de5f2b74712195d67afd8d4afa6e Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期一, 26 十二月 2022 10:18:23 +0800
Subject: [PATCH] fix: 小程序群重复和是否进群

---
 src/main/java/com/example/jz/controller/WxAppController.java     |    2 +-
 src/main/java/com/example/jz/service/impl/ReportServiceImpl.java |    1 +
 2 files changed, 2 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 8d09512..658cccc 100644
--- a/src/main/java/com/example/jz/controller/WxAppController.java
+++ b/src/main/java/com/example/jz/controller/WxAppController.java
@@ -200,7 +200,7 @@
     @GetMapping("/user/group/list")
     public R getUserMessage(@RequestParam Integer id, @RequestParam String newDate, @RequestParam String lastDate) {
         ArrayList<Map<String, Object>> list = new ArrayList<>();
-        reportService.list((new QueryWrapper<Report>().eq("user_id", id)))
+        reportService.list((new QueryWrapper<Report>().eq("user_id", id)).groupBy("user_id"))
                 .forEach(item ->
                         {
                             GroupUser groupUser = groupUserService.getOne(new QueryWrapper<GroupUser>().eq("user_id", item.getId()));
diff --git a/src/main/java/com/example/jz/service/impl/ReportServiceImpl.java b/src/main/java/com/example/jz/service/impl/ReportServiceImpl.java
index 6842e8c..2d39893 100644
--- a/src/main/java/com/example/jz/service/impl/ReportServiceImpl.java
+++ b/src/main/java/com/example/jz/service/impl/ReportServiceImpl.java
@@ -78,6 +78,7 @@
     public Boolean audit(Report report) {
         // 1. 鏇存柊鎶ユ琛�
         report.setStatus(1);
+        report.setIsInGroup(1);
         reportDao.updateById(report);
         // 2. 鏇存柊缇ょ敤鎴疯〃
         Group group = groupDao.selectOne(new LambdaQueryWrapper<>(Group.class)

--
Gitblit v1.8.0