From ebba2c050590fca7d5376b212d0d68d3c84a4159 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 24 二月 2025 18:08:51 +0800
Subject: [PATCH] 修改循环依赖问题

---
 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 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 839b5b3..a5fab15 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
@@ -29,8 +29,10 @@
 import com.panzhihua.sangeshenbian.model.vo.ComplaintVO;
 import com.panzhihua.sangeshenbian.service.ISystemUserService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -51,7 +53,9 @@
 @RequiredArgsConstructor
 public class ComplaintServiceImpl extends ServiceImpl<ComplaintMapper, Complaint> implements IComplaintService {
     private final ISystemUserService systemUserService;
-    private final IComplaintFlowService complaintFlowService;
+    @Lazy
+    @Resource
+    private IComplaintFlowService complaintFlowService;
     private final IComplaintProgressService complaintProgressService;
 
     private final IComplaintAuditRecordService complaintAuditRecordService;
@@ -122,11 +126,11 @@
                     break;
                 case 3:
                     //街道
-                    targetId = systemUser.getStreetCode();
+                    targetId = systemUser.getStreetId().toString();
                     break;
                 case 4:
                     //社区
-                    targetId = systemUser.getCommunityCode();
+                    targetId = systemUser.getCommunityId().toString();
                     break;
             }
             isSuperior = 1;
@@ -224,7 +228,7 @@
 
             // 使用基本类型比较并补充默认分支
             if (accountLevel == ReportTypeEnum.COMMUNITY.getCode()) {
-                superiorId = Long.parseLong(adminUser.getStreetCode());
+                superiorId = adminUser.getStreetId().longValue();
             } else if (accountLevel == ReportTypeEnum.STREET.getCode()) {
                 superiorId = Long.parseLong(adminUser.getDistrictsCode());
             } else if (accountLevel == ReportTypeEnum.DISTRICT.getCode()) {
@@ -272,9 +276,9 @@
 
         // 使用基本类型比较并补充默认分支
         if (accountLevel == ReportTypeEnum.STREET.getCode()) {
-            superiorId = Long.parseLong(adminUser.getCommunityCode());
+            superiorId = adminUser.getCommunityId().longValue();
         } else if (accountLevel == ReportTypeEnum.DISTRICT.getCode()) {
-            superiorId = Long.parseLong(adminUser.getStreetCode());
+            superiorId = adminUser.getStreetId().longValue();
         } else if (accountLevel == ReportTypeEnum.CITY.getCode()) {
             superiorId = Long.parseLong(adminUser.getDistrictsCode());
         } else {
@@ -396,11 +400,11 @@
                     break;
                 case 3:
                     //街道
-                    targetId = systemUser.getStreetCode();
+                    targetId = systemUser.getStreetId().toString();
                     break;
                 case 4:
                     //社区
-                    targetId = systemUser.getCommunityCode();
+                    targetId = systemUser.getCommunityId().toString();
                     break;
             }
             isSuperior = 1;

--
Gitblit v1.7.1