From 33e5113e02e32b8553c5f4edd07eb1f149594f04 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 24 二月 2025 18:59:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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..70be01a 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,12 @@
import com.panzhihua.sangeshenbian.model.vo.ComplaintVO;
import com.panzhihua.sangeshenbian.service.ISystemUserService;
import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+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;
@@ -48,7 +52,7 @@
* @since 2025-02-22
*/
@Service
-@RequiredArgsConstructor
+@RequiredArgsConstructor(onConstructor_ = {@Lazy})
public class ComplaintServiceImpl extends ServiceImpl<ComplaintMapper, Complaint> implements IComplaintService {
private final ISystemUserService systemUserService;
private final IComplaintFlowService complaintFlowService;
@@ -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