From 39faeb972b20562bf2f0b7b8cc4474ea8a3998e1 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 20 五月 2025 23:53:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-2.0.1' into dev-2.0.1
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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 171c4ec..0b161b4 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
@@ -779,6 +779,7 @@
complaintAuditRecord.setReporterLevel(reporterLevel);
complaintAuditRecord.setReporterId(reporterId);
complaintAuditRecord.setApplyName(reporter);
+ complaintAuditRecord.setApplyPhone(phone);
complaintAuditRecordService.save(complaintAuditRecord);
}
@@ -1037,6 +1038,7 @@
record1.setDepartmentName(departmentName);
// 冗余申请人名称
record1.setApplyName(reporter);
+ record1.setApplyPhone(loginUserInfoVO.getPhone());
complaintAuditRecordService.save(record1);
}
@@ -1671,7 +1673,7 @@
targetId = partyMember.getId();
} else if (identity.equals(2)) {
//上级
- if (StringUtils.isBlank(query.getAreaId())) {
+ if (Objects.nonNull(query.getTier()) && query.getTier().equals(-1)) {
accountLevel = systemUserLevel.getLevel();
switch (systemUserLevel.getLevel()) {
case 1:
@@ -1691,9 +1693,12 @@
targetId = systemUserLevel.getCommunityId();
break;
}
+ }else {
+ targetId = Long.valueOf(query.getAreaId());
+ accountLevel = query.getTier();
}
}
- return baseMapper.queryCompliantList(targetId, accountLevel, loginUserInfo);
+ return baseMapper.queryCompliantList(targetId, accountLevel, loginUserInfo,query);
}
}
--
Gitblit v1.7.1