From 039abee6b27058ca46b1e1e82aa0b5407a5dad44 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 28 七月 2025 15:25:26 +0800
Subject: [PATCH] 优化 和修改bug

---
 springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/api/MgtComplaintController.java |   31 ++++++++++++++++++++++++++++---
 1 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/api/MgtComplaintController.java b/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/api/MgtComplaintController.java
index cfcf82e..82f5fca 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/api/MgtComplaintController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/api/MgtComplaintController.java
@@ -65,13 +65,25 @@
     public R<List<DispatchVO>> getAllocationList() {
         SystemUserVo loginUserInfoWest = getLoginUserInfoWest();
         SystemUser systemUser = systemUserService.getById(loginUserInfoWest.getId());
-        if(systemUser.getSystemRoleId()!=1){
+        if(systemUser.getSystemRoleId()>2){
             return R.fail("非管理员,无权限");
         }
         List<DispatchVO> dispatchVOList = new ArrayList<>();
         Integer oneDepartmentId = systemUser.getOneDepartmentId();
         Department byId = departmentService.getById(oneDepartmentId);
-        List<Department> list1 = departmentService.list(new LambdaQueryWrapper<Department>().eq(Department::getTier, byId.getTier()));
+        LambdaQueryWrapper<Department> eq = new LambdaQueryWrapper<Department>().eq(Department::getTier, byId.getTier());
+
+        if(byId.getTier()==2){
+            eq.eq(Department::getDistrictsCode, byId.getDistrictsCode());
+        }
+        if(byId.getTier()==3){
+            eq.eq(Department::getStreetId, byId.getStreetId());
+        }
+        if(byId.getTier()==4){
+            eq.eq(Department::getCommunityId, byId.getCommunityId());
+        }
+
+        List<Department> list1 = departmentService.list(eq);
         for (Department department : list1) {
             DispatchVO dispatchVO = new DispatchVO();
             dispatchVO.setId(department.getId().toString());
@@ -156,7 +168,7 @@
 
     @ApiOperation("诉求详情")
     @GetMapping("/detail/{id}")
-    public R<ComplaintVO> detail(Long id) {
+    public R<ComplaintVO> detail(@PathVariable("id") Long id) {
         SystemUserVo loginUserInfoWest = getLoginUserInfoWest();
         LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
         loginUserInfoVO.setPhone(loginUserInfoWest.getPhone());
@@ -350,4 +362,17 @@
     }
 
 
+
+    @DeleteMapping("/delete/{id}")
+    @ApiOperation(value = "删除诉求")
+    public R<?> delete(@PathVariable("id") Long id) {
+        SystemUserVo loginUserInfoWest = getLoginUserInfoWest();
+        if (loginUserInfoWest.getSystemRoleId()>2) {
+            return R.fail("无权限");
+        }
+        complaintService.removeById(id);
+        return R.ok();
+    }
+
+
 }

--
Gitblit v1.7.1