办理部门和申请部门查询修改 查询人、组织接口修改

wangwh

2024-09-10 f0ee71145111bc6ef12c1990fd44d02e688ca31f

 dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java

@@ -315,12 +315,10 @@
        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");
        ctDeptQueryWrapper.eq("unit_id", loginUser.getUnitId()).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();
@@ -329,6 +327,7 @@
            unitSelectTerm.setParentId(ctUnit.getParentId());
            unitSelectTerm.setCheckable(true);
            List<SelectTermDTO> deptSelectTerms = new ArrayList<>();
            if(loginUser.getUnitId().equals(ctUnit.getId())){
            for(CtDept ctDept : ctDeptList){
                if(ctUnit.getId().equals(ctDept.getUnitId())){
                    SelectTermDTO deptSelectTerm = new SelectTermDTO();
@@ -342,6 +341,7 @@
                List<SelectTermDTO> depts = SelectTermUtils.createTreeByRoot(deptSelectTerms);
                unitSelectTerm.setChildren(depts);
            }
            }
            unitSelectTerms.add(unitSelectTerm);
        }
        return SelectTermUtils.createTreeByFirst(unitSelectTerms, loginUser.getUnitId());