From 0261d270c9f9b5282d923e585c307aee44b0612c Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期四, 23 三月 2023 14:23:39 +0800
Subject: [PATCH] 删除警员，对应案件
---
src/main/java/com/example/jz/controller/UserController.java | 20 ++++++++++++++++----
src/main/java/com/example/jz/controller/WxAppController.java | 4 ++++
2 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/example/jz/controller/UserController.java b/src/main/java/com/example/jz/controller/UserController.java
index 7093075..e88dbff 100644
--- a/src/main/java/com/example/jz/controller/UserController.java
+++ b/src/main/java/com/example/jz/controller/UserController.java
@@ -17,7 +17,7 @@
import org.springframework.web.bind.annotation.*;
import java.io.Serializable;
-import java.util.Date;
+import java.util.*;
import java.util.function.Consumer;
/**
@@ -145,9 +145,21 @@
@DeleteMapping("/manager")
@ApiOperation("鍒犻櫎绠＄悊")
public R removeManager(@RequestParam Integer id) {
- causeService.list(new LambdaQueryWrapper<Cause>().eq(Cause::getUserId, id)).forEach(item -> {
- causeService.deleteCause(item.getId());
- });
+ List<Cause> list = causeService.list(new LambdaQueryWrapper<Cause>().eq(Cause::getUserId, id));
+ if (!Objects.isNull(list) && list.size() != 0){
+ ArrayList<Map> maps = new ArrayList<>();
+ for (Cause cause : list) {
+ HashMap<String, String> map = new HashMap<>();
+ map.put("caseName", cause.getName());
+ map.put("caseNumber", cause.getNumber());
+ maps.add(map);
+ }
+ return R.failed(maps, "璇ヨ鍛樿繕鏈夋浠跺叧鑱�,鑻ヨ鍒犻櫎璇峰厛淇敼瀵瑰簲妗堜欢鍏宠仈鐨勮鍛�");
+ }
+// causeService.list(new LambdaQueryWrapper<Cause>().eq(Cause::getUserId, id)).forEach(item -> {
+// causeService.deleteCause(item.getId());
+// });
+// userService.remove(new LambdaQueryWrapper<User>().eq(User::getId, id));
messageService.remove(new LambdaQueryWrapper<Message>().eq(Message::getCopId, id));
return R.ok(userService.removeById(id));
}
diff --git a/src/main/java/com/example/jz/controller/WxAppController.java b/src/main/java/com/example/jz/controller/WxAppController.java
index c947455..6c9b5bd 100644
--- a/src/main/java/com/example/jz/controller/WxAppController.java
+++ b/src/main/java/com/example/jz/controller/WxAppController.java
@@ -555,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);
--
Gitblit v1.8.0