From 2723e04976f006ace42c6c53627b87e1cc95ff07 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期三, 31 七月 2024 12:27:48 +0800
Subject: [PATCH] 修改bug&分享
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfClanController.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfClanController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfClanController.java
index 4126b65..7264cab 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfClanController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfClanController.java
@@ -7,10 +7,18 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.domain.Meeting;
+import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.ZfClan;
+import com.ruoyi.service.ZInfoUserService;
import com.ruoyi.service.ZfClanService;
+import com.ruoyi.system.mapper.SysUserRoleMapper;
+import com.ruoyi.system.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+import java.util.List;
import static com.ruoyi.common.core.page.TableSupport.*;
@@ -20,11 +28,25 @@
@Autowired
ZfClanService zfClanService;
+ @Autowired
+ private ISysUserService userService;
+
+ @Resource
+ ZInfoUserService zInfoUserService;
+
+ @Resource
+ private SysUserRoleMapper sysUserRoleMapper;
+
@GetMapping("/all")
public AjaxResult listAll(ZfClan zfClan){
Integer pageNo = Convert.toInt(ServletUtils.getParameter(PAGE_NO), 1);
Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
return zfClanService.selectDataList(zfClan, pageNo, pageSize);
+ }
+
+ @GetMapping("/satisfy")
+ public AjaxResult listSatisfy(ZfClan zfClan){
+ return zfClanService.selectDataList(zfClan);
}
/**
@@ -34,8 +56,10 @@
@PostMapping
public AjaxResult add(@RequestBody ZfClan zfClan)
{
+
return zfClanService.addData(zfClan);
}
+
/**
* 淇敼瀹舵棌
@@ -46,6 +70,12 @@
return zfClanService.updateData(zfClan);
}
+ private void deleteUser(Long clanId){
+ List<ZInfoUser> allMember = zInfoUserService.selectByClanId(clanId.intValue());
+ for (ZInfoUser member: allMember) {
+ userService.deleteUserById(member.getSysId());
+ }
+ }
/**
* 鎵归噺鍒犻櫎瀹舵棌
@@ -53,6 +83,7 @@
@Log(title = "瀹舵棌", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long ids) {
+ deleteUser(ids);
return zfClanService.deleteData(ids);
}
--
Gitblit v1.9.1