From 0a68d1ae4a7e797342cf039a757fae4fc357faef Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 07 八月 2025 08:46:07 +0800
Subject: [PATCH] zjh202500807
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 58 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 35 insertions(+), 23 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..3710a7c 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,48 +153,50 @@
@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) {
return AjaxResult.error("璇疯緭鍏ョ瀹d");
}
//鏍规嵁褰撳墠鐧婚檰鐨勪汉鐨勭瀹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;
+
+ SysDept dept = deptService.getById(ksId);
+
+ 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(null !=dept){
+ if(StringUtil.isNotBlank(dept.getSjks())){
+ ksId+=(","+dept.getSjks());
+ }
+ }
+
+
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);
@@ -576,6 +578,7 @@
}
ksId = Math.toIntExact(sysUser.getDeptId());
}
+ SysDept dept = deptService.getById(ksId);
String configByKey = configService.selectConfigByKey("sfkqdyhis");
// 鍒ゆ柇鏄惁鏀惰垂 璇锋眰鎺ュ彛
TjOrder tjOrder = orderService.getOrderByTjNum(tjNumber);
@@ -642,6 +645,15 @@
}
}
}
+ if(null !=dept){
+ if(StringUtil.isNotBlank(dept.getSjks())){
+ String[] arr = dept.getSjks().split(","); // 鏍规嵁閫楀彿杩涜鍒囧壊
+ for (String s : arr) {
+ int num = Integer.parseInt(s); // 灏嗘瘡涓瓙瀛楃涓茶浆鎹负integer绫诲瀷
+ split.add(num); // 娣诲姞鍒板垪琛ㄤ腑
+ }
+ }
+ }
log.info("鏌ヨ鍏宠仈绉戝闆嗗悎 ->{}",split);
List<TjOrderRemark> list;
if (null != sysUser && sysUser.getUserName().equals("10001")) {
--
Gitblit v1.8.0