From abb0d631ffed8b67b0a78205ba127b46a4cb546b Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Tue, 10 Sep 2024 16:29:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java
index c681d15..59a4abf 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java
@@ -312,13 +312,7 @@
// 获取当前登录用户
CtUserDTO loginUser = ctUserService.clientGetUserAll(userId);
// 组织条件
- QueryWrapper<CtUnit> ctUnitQueryWrapper = new QueryWrapper<>();
- if (RoleBaseEnum.checkAdminPower(loginUser)){
- ctUnitQueryWrapper.eq("cust_id", loginUser.getCustId()).select("id", "unit_name", "parent_id");
- }else {
- ctUnitQueryWrapper.eq("id", loginUser.getUnitId()).select("id", "unit_name", "parent_id");
- }
- List<CtUnit> ctUnitList = this.list(ctUnitQueryWrapper);
+ List<CtUnit> ctUnitList = mapper.listAllChild(loginUser.getUnitId());
List<SelectTermDTO> unitSelectTerms = new ArrayList<>();
List<String> unitIdList= ctUnitList.stream().map(CtUnit::getId).collect(Collectors.toList());
@@ -333,7 +327,7 @@
unitSelectTerm.setValue(ctUnit.getId());
unitSelectTerm.setLabel(ctUnit.getUnitName());
unitSelectTerm.setParentId(ctUnit.getParentId());
- unitSelectTerm.setCheckable(false);
+ unitSelectTerm.setCheckable(true);
List<SelectTermDTO> deptSelectTerms = new ArrayList<>();
for(CtDept ctDept : ctDeptList){
if(ctUnit.getId().equals(ctDept.getUnitId())){
@@ -341,7 +335,7 @@
deptSelectTerm.setValue(ctDept.getId());
deptSelectTerm.setLabel(ctDept.getName());
deptSelectTerm.setParentId(ctDept.getParentId());
- deptSelectTerm.setCheckable(false);
+ deptSelectTerm.setCheckable(true);
deptSelectTerms.add(deptSelectTerm);
}
--
Gitblit v1.8.0