From 039abee6b27058ca46b1e1e82aa0b5407a5dad44 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 28 七月 2025 15:25:26 +0800
Subject: [PATCH] 优化 和修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/service/impl/SystemMenuServiceImpl.java | 2 +-
springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/api/DepartmentController.java | 2 +-
springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/api/AnalyticStatisticsController.java | 2 +-
springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/service/impl/ComplaintServiceImpl.java | 5 +++--
springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/api/MgtComplaintController.java | 2 +-
5 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/api/AnalyticStatisticsController.java b/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/api/AnalyticStatisticsController.java
index 4c2f1ba..fa6c45d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/api/AnalyticStatisticsController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/api/AnalyticStatisticsController.java
@@ -194,7 +194,7 @@
})
public R<?> getNextRegion(@RequestParam String id, @RequestParam Integer type){
if(type==1){
- List<ComStreet> list3 = comStreetService.list(new LambdaQueryWrapper<ComStreet>().eq(ComStreet::getAreaCode, id));
+ List<ComStreet> list3 = comStreetService.list(new LambdaQueryWrapper<ComStreet>().eq(ComStreet::getAppId, "wx0cef797390444b75"));
return R.ok(list3);
}
if(type==2){
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/api/DepartmentController.java b/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/api/DepartmentController.java
index 7e50eba..ff121aa 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/api/DepartmentController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/api/DepartmentController.java
@@ -104,7 +104,7 @@
public R<List<Department>> getList(String name,Integer level,String code,int type){
SystemUserVo loginUserInfoWest = getLoginUserInfoWest();
if(level==null){
- if(loginUserInfoWest.getSystemRoleId()!=1){
+ if(loginUserInfoWest.getSystemRoleId()>2){
return R.ok(new ArrayList<>());
}
level=loginUserInfoWest.getAccountLevel();
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/api/MgtComplaintController.java b/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/api/MgtComplaintController.java
index 40ba19b..82f5fca 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/api/MgtComplaintController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/api/MgtComplaintController.java
@@ -65,7 +65,7 @@
public R<List<DispatchVO>> getAllocationList() {
SystemUserVo loginUserInfoWest = getLoginUserInfoWest();
SystemUser systemUser = systemUserService.getById(loginUserInfoWest.getId());
- if(systemUser.getSystemRoleId()!=1){
+ if(systemUser.getSystemRoleId()>2){
return R.fail("非管理员，无权限");
}
List<DispatchVO> dispatchVOList = new ArrayList<>();
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/service/impl/ComplaintServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/service/impl/ComplaintServiceImpl.java
index aa0a69c..33eaa84 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/service/impl/ComplaintServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/service/impl/ComplaintServiceImpl.java
@@ -1238,7 +1238,7 @@
complaintAuditRecord.setAuditTime(new Date());
- if (systemUser.getSystemRoleId() != 1 || systemUser.getAccountLevel() != complaintAuditRecord.getReporterLevel()) {
+ if (systemUser.getSystemRoleId() > 2 || systemUser.getAccountLevel() != complaintAuditRecord.getReporterLevel()) {
throw new ServiceException("无权审核");
}
@@ -1259,6 +1259,7 @@
Complaint complaint = this.getById(complaintReporAuditDTO.getId());
complaint.setAssignPersonId(complaintReporAuditDTO.getDeptId());
complaint.setAssignStatus(1);
+ complaint.setFirstStatus(1);
complaint.setLastSuperiorId(complaint.getSuperiorId());
complaint.setLastLevel(complaint.getNowLevel());
complaint.setRemark(complaintReporAuditDTO.getRemark());
@@ -1521,7 +1522,7 @@
IdentityInformation identityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfo);
List<DispatchVO> dispatchVOList = new ArrayList<>();
SystemUser adminUser = identityInformation.getSystemUser();
- if (adminUser.getSystemRoleId() != 1) {
+ if (adminUser.getSystemRoleId() >2) {
throw new ServiceException("无权查看");
}
Integer oneDepartmentId = adminUser.getOneDepartmentId();
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/service/impl/SystemMenuServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/service/impl/SystemMenuServiceImpl.java
index 4e0937e..c7a9edb 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/service/impl/SystemMenuServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/service/impl/SystemMenuServiceImpl.java
@@ -21,7 +21,7 @@
@Override
public List<SystemMenu> getSystemMenuList(SystemUserVo systemUserVo) {
List<SystemMenu> list = this.list();
- if(systemUserVo.getSystemRoleId()!=1){
+ if(systemUserVo.getSystemRoleId()>2){
list = list.stream().filter(s->s.getId() != 1 || s.getId()!=2 || s.getId()!=3 || s.getId()!=35 || s.getId()!=61 || s.getId()!=62).collect(Collectors.toList());
}
List<SystemMenu> collect = list.stream().filter(s->s.getParentId() == 0 && s.getId() != 3 ).collect(Collectors.toList());
--
Gitblit v1.7.1