From a3da2a6fe70e9514638ea4700c4bb2b61ecbc317 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 22 五月 2025 16:50:55 +0800
Subject: [PATCH] zjh20250522
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 60 +++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 39 insertions(+), 21 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
index 9275dea..fbb30fa 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -153,12 +153,12 @@
@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
@ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize) {
String userId = SecurityUtils.getLoginUser().getUserId();
- Integer ksId = null;
+ String ksId = null;
SysUser sysUser = null;
if (null != userId) {
sysUser = userService.getById(Long.valueOf(userId));
if (null != sysUser) {
- ksId = Math.toIntExact(sysUser.getDeptId());
+ ksId = sysUser.getDeptId().toString();
}
}
if (ksId == null) {
@@ -167,34 +167,52 @@
//鏍规嵁褰撳墠鐧婚檰鐨勪汉鐨勭瀹d锛岃幏鍙栬绉戝涓嬬殑鎵�鏈夐」鐩�
List<Long> postIds = sysUser.getPostIds();
List<Long> ksproList = null;
- if (postIds != null) {
- for (Long postId : postIds) {
- LambdaQueryWrapper<SysUserPost> wq111 = new LambdaQueryWrapper<>();
- wq111.eq(SysUserPost::getPostId, postId);
- SysUserPost one = userPostService.getOne(wq111);
- if (one != null) {
- SysPost byId = postService.getById(one.getPostId());
- if (byId.getPostName().equals("褰曞叆鍛�")) {
- ksproList = projectService.getKsTjProjectIdListBydeptId(String.valueOf(ksId));
- }
- }
+
+ String byKey =null;
+
+// if (postIds != null) {
+// for (Long postId : postIds) {
+// LambdaQueryWrapper<SysUserPost> wq111 = new LambdaQueryWrapper<>();
+// wq111.eq(SysUserPost::getPostId, postId);
+// SysUserPost one = userPostService.getOne(wq111);
+// if (one != null) {
+// SysPost byId = postService.getById(one.getPostId());
+// if (byId.getPostName().equals("褰曞叆鍛�")) {
+// ksproList = projectService.getKsTjProjectIdListBydeptId(String.valueOf(ksId));
+// }
+// if (byId.getPostName().equals("鍓嶅彴")) {
+// byKey = configService.selectConfigByKey("qt_kjksid");
+//
+// }
+// }
+// }
+// } else {
+// ksproList = projectService.getKsTjProjectIdList();
+// }
+//
+// if (ksproList == null || ksproList.isEmpty()) {
+// return AjaxResult.error("璇峰畬鍠勭瀹ら」鐩俊鎭�");
+// }
+
+ List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+ if (null != roles && !roles.isEmpty()) {
+ List<SysRole> list = roles.stream().filter(item -> item.getRoleName().contains("鍓嶅彴")).collect(Collectors.toList());
+ if (!list.isEmpty()) {
+ byKey = configService.selectConfigByKey("qt_kjksid");
}
- } else {
- ksproList = projectService.getKsTjProjectIdList();
}
- if (ksproList == null || ksproList.isEmpty()) {
- return AjaxResult.error("璇峰畬鍠勭瀹ら」鐩俊鎭�");
- }
- List<TjCustomer> customerLis = new ArrayList<>();
if (null == name) name = "";
if (null == tjNumber) tjNumber = "";
Map<String, Object> map = null;
+ if ( StringUtil.isNotBlank(byKey)) {
+ ksId+=(","+byKey);
+ }
if (type == 0) {
- map = deptService.getSysDeptYjWjCustomerList13(String.valueOf(ksId), name, tjNumber, 0, page, pageSize);
+ map = deptService.getSysDeptYjWjCustomerList13(ksId, name, tjNumber, 0, page, pageSize);
}
if (type == 1) {
- map = deptService.getSysDeptYjWjCustomerList13(String.valueOf(ksId), name, tjNumber, 1, page, pageSize);
+ map = deptService.getSysDeptYjWjCustomerList13(ksId, name, tjNumber, 1, page, pageSize);
}
return AjaxResult.success(map);
--
Gitblit v1.8.0