From d4aca95b4a0a7a71162beb383b2d39fc7ee064bf Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 27 二月 2025 19:17:42 +0800
Subject: [PATCH] 修改延期申请服务器异常

---
 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java
index 059f04b..d412df2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java
@@ -630,13 +630,13 @@
         record1.setComplaintId(complaint.getId());
         record1.setLatestFlag(true);
         record1.setAuditType(2);
-        record1.setAuditStatus(2);
+        record1.setAuditStatus(0);
         record1.setCreateBy(loginUserInfoVO.getUserId());
         record1.setCreateTime(new Date(System.currentTimeMillis()));
         record1.setUpdateBy(loginUserInfoVO.getUserId());
         record1.setUpdateTime(new Date(System.currentTimeMillis()));
         record1.setReporter(loginUserInfoVO.getNickName());
-        record1.setReportType(systemUser.getAccountLevel());
+        record1.setReportType(Objects.isNull(systemUser) ? 5 : systemUser.getAccountLevel());
         record1.setSuperiorId(currentId);
         record1.setSort(count + 1);
         complaintAuditRecordService.save(record1);
@@ -645,7 +645,7 @@
         record2.setComplaintId(complaint.getId());
         record2.setLatestFlag(true);
         record2.setAuditType(2);
-        record2.setAuditStatus(2);
+        record2.setAuditStatus(0);
         record2.setCreateBy(loginUserInfoVO.getUserId());
         record2.setCreateTime(new Date(System.currentTimeMillis()));
         record2.setUpdateBy(loginUserInfoVO.getUserId());
@@ -743,7 +743,8 @@
         // 使用基本类型比较并补充默认分支
         List<DispatchVO> dispatchVOList = new ArrayList<>();
         if (accountLevel == ReportTypeEnum.STREET.getCode()) {
-            List<ComAct> list = comActService.list();
+            String streetId = adminUser.getStreetId();
+            List<ComAct> list = comActService.list(new LambdaQueryWrapper<ComAct>().eq(ComAct::getStreetId, streetId).eq(ComAct::getState, 0));
             for (ComAct comAct : list) {
                 DispatchVO dispatchVO = new DispatchVO();
                 dispatchVO.setId(comAct.getCommunityId().toString());
@@ -751,7 +752,8 @@
                 dispatchVOList.add(dispatchVO);
             }
         } else if (accountLevel == ReportTypeEnum.DISTRICT.getCode()) {
-            List<ComStreet> list = comStreetService.list();
+            String districtsCode = adminUser.getDistrictsCode();
+            List<ComStreet> list = comStreetService.list(new LambdaQueryWrapper<ComStreet>().eq(ComStreet::getAreaCode, districtsCode));
             for (ComStreet street : list) {
                 DispatchVO dispatchVO = new DispatchVO();
                 dispatchVO.setId(street.getStreetId().toString());

--
Gitblit v1.7.1