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/api/DepartmentController.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
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 de5d127..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,10 +104,19 @@
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();
+ if(level==2){
+ code="510403";
+ }
+ if(level==3){
+ code = loginUserInfoWest.getStreetId();
+ }
+ if(level==4){
+ code = loginUserInfoWest.getCommunityId().toString();
+ }
type=2;
}
List<Department> list4=new ArrayList<>();
@@ -116,15 +125,15 @@
}else if(level==2 && type==2){
list4 = departmentService.list(new LambdaQueryWrapper<Department>().like(StringUtils.isNotEmpty(name), Department::getName, name).ge( Department::getTier, 2));
}else if(level==3 && type==1){
- list4 = departmentService.list(new LambdaQueryWrapper<Department>().like(StringUtils.isNotEmpty(name), Department::getName, name).eq( Department::getTier, 3).eq(Department::getStreetId, loginUserInfoWest.getStreetId()));
+ list4 = departmentService.list(new LambdaQueryWrapper<Department>().like(StringUtils.isNotEmpty(name), Department::getName, name).eq( Department::getTier, 3).eq(Department::getStreetId, code));
}else if(level==3 && type==2){
- List<Long> ids = comActService.list(new LambdaQueryWrapper<ComAct>().eq(ComAct::getStreetId, loginUserInfoWest.getStreetId())).stream().map(ComAct::getCommunityId).collect(Collectors.toList());
- list4 = departmentService.list(new LambdaQueryWrapper<Department>().like(StringUtils.isNotEmpty(name), Department::getName, name).eq( Department::getTier, 3).eq(Department::getStreetId, loginUserInfoWest.getStreetId())
+ List<Long> ids = comActService.list(new LambdaQueryWrapper<ComAct>().eq(ComAct::getStreetId, code)).stream().map(ComAct::getCommunityId).collect(Collectors.toList());
+ list4 = departmentService.list(new LambdaQueryWrapper<Department>().like(StringUtils.isNotEmpty(name), Department::getName, name).eq( Department::getTier, 3).eq(Department::getStreetId, code)
.or(w->w.eq(Department::getTier,4).in(Department::getCommunityId,ids)));
}else if(level==4 && type==1){
- list4 = departmentService.list(new LambdaQueryWrapper<Department>().like(StringUtils.isNotEmpty(name), Department::getName, name).eq( Department::getTier, 4).eq(Department::getCommunityId,loginUserInfoWest.getCommunityId()));
+ list4 = departmentService.list(new LambdaQueryWrapper<Department>().like(StringUtils.isNotEmpty(name), Department::getName, name).eq( Department::getTier, 4).eq(Department::getCommunityId,code));
}else if(level==4 && type==2){
- list4 = departmentService.list(new LambdaQueryWrapper<Department>().like(StringUtils.isNotEmpty(name), Department::getName, name).eq(Department::getTier, 4).eq(Department::getCommunityId,loginUserInfoWest.getCommunityId()));
+ list4 = departmentService.list(new LambdaQueryWrapper<Department>().like(StringUtils.isNotEmpty(name), Department::getName, name).eq(Department::getTier, 4).eq(Department::getCommunityId,code));
}
return R.ok(list4);
@@ -136,7 +145,7 @@
@OperLog(operModul = "西区纪委后台",operType = 0, businessType = "获取单位列表")
public R<Page<Department>> getDeptList(String name,int pageNum,int pageSize){
SystemUserVo loginUserInfoWest = getLoginUserInfoWest();
- if(loginUserInfoWest.getSystemRoleId()!=1){
+ if(loginUserInfoWest.getSystemRoleId()>2){
return R.ok(new Page<>());
}
Integer accountLevel = loginUserInfoWest.getAccountLevel();
--
Gitblit v1.7.1