java/YiFeiNN.git

			@@ -150,6 +150,7 @@
			@NotNull
			private Map<Long, List<SysDepartment>> getChildrenDepartmentMap(SysDepartment myDepartment) {
			List<SysDepartment> sysDepartmentList = this.lambdaQuery()
			.ne(SysDepartment::getOrgType , 4)
			.likeRight(SysDepartment::getTreeCode, myDepartment.getTreeCode())
			.orderByDesc(SysDepartment::getCreateTime)
			.list();
			@@ -219,6 +220,13 @@
			// }
			Map<Long, List<SysDepartment>> childrenMap = getChildrenDepartmentMap(currentDepartment);
			SysDepartmentVO sysDepartmentVO = fillChildrenTreeModel(currentDepartment, childrenMap);
			Integer orgType = sysDepartmentVO.getOrgType();
			if (sysDepartmentVO.getOrgType()==4){
			SysDepartment byId = this.getById(sysDepartmentVO.getParentId());
			childrenMap = getChildrenDepartmentMap(byId);
			sysDepartmentVO = fillChildrenTreeModel(byId, childrenMap);
			sysDepartmentVO.setChildren(new ArrayList<>());
			}
			if (sysDepartmentVO.getTreeCode().length()==10){
			SysDepartment sysDepartment = this.baseMapper.selectById(sysDepartmentVO.getParentId());
			SysDepartmentVO sysDepartmentVO1 = new SysDepartmentVO();
			@@ -233,7 +241,7 @@
			SysDepartmentVO sysDepartmentVO1 = new SysDepartmentVO();
			BeanUtils.copyProperties(sysDepartment,sysDepartmentVO1);
			List<SysDepartmentVO> root1 = new ArrayList<>();
			root1.add(sysDepartmentVO);
			root1.add(sysDepartmentVO);
			sysDepartmentVO1.setChildren(root1);


			@@ -242,7 +250,7 @@
			BeanUtils.copyProperties(sysDepartment2,sysDepartmentVO2);
			List<SysDepartmentVO> root2 = new ArrayList<>();
			root2.add(sysDepartmentVO1);
			sysDepartmentVO2.setChildren(root2);
			sysDepartmentVO2.setChildren(root2);
			sysDepartmentVO = sysDepartmentVO2;
			}
			root.add(sysDepartmentVO);