From 0f9f1c1b9a92c0eaf4b8102d430d6eeba2550ab2 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 03 四月 2025 15:15:54 +0800
Subject: [PATCH] 问题处理单导出调整
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java | 15 +++++++--------
1 files changed, 7 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 40e393c..26ea71e 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
@@ -235,7 +235,8 @@
vo.setEvaluateButtonStatus(1);
vo.setAuditButtonStatus(1);
// 获取身份
- Integer identity = (Integer) redisUtils.get("identity:" + loginUserInfo.getPhone());
+ IdentityInformation currentIdentityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfo);
+ Integer identity = currentIdentityInformation.getIdentity();
ComplaintAuditRecord one = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>()
.eq(ComplaintAuditRecord::getComplaintId, vo.getId())
// .ne(ComplaintAuditRecord::getAuditType, 1)
@@ -268,12 +269,11 @@
//判断当前审核状态
if (one.getAuditStatus() == 1) {
//审核状态为通过，则权限给到上报审核的这一层
- if (systemUserByPhone.isPresent()) {
+ if (systemUserByPhone.isPresent() && identity == 2) {
SystemUser systemUser = systemUserByPhone.get();
Integer accountLevel = systemUser.getAccountLevel();
- Integer isAdmin = systemUser.getIsAdmin();
//非党员用户，必须是管理员有权限
- if (accountLevel.compareTo(one.getReportType()) == 0 && accountLevel != 5 && 1 == isAdmin) {
+ if (accountLevel.compareTo(one.getReportType()) == 0) {
vo.setListControlsButtonStatus(0);
}
}
@@ -343,8 +343,7 @@
String targetId = "";
Integer accountLevel = 5;
//获取当前身份，1=党员，2=管理员
- IdentityInformation identityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfo);
- if (2 == identityInformation.getIdentity()) {
+ if (2 == currentIdentityInformation.getIdentity()) {
accountLevel = systemUser.getAccountLevel();
switch (accountLevel) {
case 1:
@@ -979,7 +978,7 @@
List<DispatchVO> dispatchVOList = new ArrayList<>();
if (accountLevel == ReportTypeEnum.STREET.getCode()) {
String streetId = adminUser.getStreetId();
- List<ComAct> list = comActService.list(new LambdaQueryWrapper<ComAct>().eq(ComAct::getStreetId, streetId).eq(ComAct::getState, 0));
+ List<ComAct> list = comActService.list(new LambdaQueryWrapper<ComAct>().eq(ComAct::getStreetId, streetId));
for (ComAct comAct : list) {
DispatchVO dispatchVO = new DispatchVO();
dispatchVO.setId(comAct.getCommunityId().toString());
@@ -1224,7 +1223,7 @@
if (Objects.nonNull(complaintComment)) {
map.put("rateStr", RateEnum.getEnumByCode(complaintComment.getRate()).getDesc());
}
- map.put("departmentLevel", ReportTypeEnum.getDescriptionByCode(loginUserInfo.getAccountLevel()) + "级");
+ //map.put("departmentLevel", ReportTypeEnum.getDescriptionByCode(loginUserInfo.getAccountLevel()) + "级");
}
response.setContentType("application/octet-stream");
String fileNameEncode = URLEncoder.encode(fileName, "UTF-8").replaceAll("\\+", "%20");
--
Gitblit v1.7.1