From e282e3bb247adc903e201e85239a504548efa7c6 Mon Sep 17 00:00:00 2001 From: wangwh <2397901735@qq.com> Date: Tue, 10 Sep 2024 14:26:20 +0800 Subject: [PATCH] 1、修改查询下级所有组织接口 2、首页相关接口 --- dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 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 67d1f95..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 @@ -1,16 +1,21 @@ package cn.huge.module.ctuser.service; +import cn.huge.base.common.dto.SelectTermDTO; import cn.huge.base.common.exception.ServiceException; import cn.huge.base.common.utils.DateUtils; import cn.huge.base.common.utils.IdUtils; import cn.huge.base.common.utils.ObjectUtils; +import cn.huge.base.common.utils.SelectTermUtils; import cn.huge.module.client.api.impl.UtilsClientImpl; import cn.huge.module.constant.BaseConsts; import cn.huge.module.ctuser.dao.mapper.CtUnitMapper; import cn.huge.module.ctuser.domain.po.CtDept; import cn.huge.module.ctuser.domain.po.CtUnit; import cn.huge.module.ctuser.domain.po.CtUser; +import cn.huge.module.ctuser.domain.po.CtUserole; import cn.huge.module.ctuser.dto.CtUnitWeChatCountDTO; +import cn.huge.module.cust.constant.RoleBaseEnum; +import cn.huge.module.cust.dto.CtUserDTO; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.collections.CollectionUtils; @@ -296,4 +301,49 @@ ctUnitWeChatCountDTO.setTzUnitNum(tzUnitNum); return ctUnitWeChatCountDTO; } + + /** + * 按条件分页查询 + * + * @param userId 分页对象 + * @return Page + */ + public List<SelectTermDTO> unitChoose(String userId) { + // 获取当前登录用户 + CtUserDTO loginUser = ctUserService.clientGetUserAll(userId); + // 组织条件 + List<CtUnit> ctUnitList = mapper.listAllChild(loginUser.getUnitId()); + List<SelectTermDTO> unitSelectTerms = new ArrayList<>(); + + List<String> unitIdList= ctUnitList.stream().map(CtUnit::getId).collect(Collectors.toList()); + // 部门条件 + QueryWrapper<CtDept> ctDeptQueryWrapper = new QueryWrapper<>(); + ctDeptQueryWrapper.in("unit_id", unitIdList).select("id", "unit_id", "name", "parent_id"); + List<CtDept> ctDeptList = ctDeptService.list(ctDeptQueryWrapper); + List<String> deptIdList = ctDeptList.stream().map(CtDept::getId).collect(Collectors.toList()); + + for(CtUnit ctUnit: ctUnitList){ + SelectTermDTO unitSelectTerm = new SelectTermDTO(); + unitSelectTerm.setValue(ctUnit.getId()); + unitSelectTerm.setLabel(ctUnit.getUnitName()); + unitSelectTerm.setParentId(ctUnit.getParentId()); + unitSelectTerm.setCheckable(true); + List<SelectTermDTO> deptSelectTerms = new ArrayList<>(); + for(CtDept ctDept : ctDeptList){ + if(ctUnit.getId().equals(ctDept.getUnitId())){ + SelectTermDTO deptSelectTerm = new SelectTermDTO(); + deptSelectTerm.setValue(ctDept.getId()); + deptSelectTerm.setLabel(ctDept.getName()); + deptSelectTerm.setParentId(ctDept.getParentId()); + deptSelectTerm.setCheckable(true); + + deptSelectTerms.add(deptSelectTerm); + } + List<SelectTermDTO> depts = SelectTermUtils.createTreeByRoot(deptSelectTerms); + unitSelectTerm.setChildren(depts); + } + unitSelectTerms.add(unitSelectTerm); + } + return SelectTermUtils.createTreeByFirst(unitSelectTerms, loginUser.getUnitId()); + } } -- Gitblit v1.8.0