lbqms.git - Gitblit

			@@ -15,6 +15,7 @@
			import org.dromara.common.core.utils.MapstructUtils;
			import org.dromara.common.core.utils.SpringUtils;
			import org.dromara.common.core.utils.StringUtils;
			import org.dromara.common.core.utils.StreamUtils;
			import org.dromara.common.core.utils.TreeBuildUtils;
			import org.dromara.common.mybatis.helper.DataBaseHelper;
			import org.dromara.common.redis.utils.CacheUtils;
			@@ -106,8 +107,8 @@
			List<Tree<Long>> treeList = CollUtil.newArrayList();
			for (SysDeptVo d : depts) {
			Long parentId = d.getParentId();
			SysDeptVo sysDeptVo = depts.stream().filter(it -> it.getDeptId().longValue() == parentId).findFirst().orElse(null);
			if (sysDeptVo == null) {
			SysDeptVo sysDeptVo = StreamUtils.findFirst(depts, it -> it.getDeptId().longValue() == parentId);
			if (ObjectUtil.isNull(sysDeptVo)) {
			List<Tree<Long>> trees = TreeBuildUtils.build(depts, parentId, (dept, tree) ->
			tree.setId(dept.getDeptId())
			.setParentId(dept.getParentId())
			@@ -276,11 +277,14 @@
			public int updateDept(SysDeptBo bo) {
			SysDept dept = MapstructUtils.convert(bo, SysDept.class);
			SysDept oldDept = baseMapper.selectById(dept.getDeptId());
			if (ObjectUtil.isNull(oldDept)) {
			throw new ServiceException("部门不存在，无法修改");
			}
			if (!oldDept.getParentId().equals(dept.getParentId())) {
			// 如果是新父部门则校验是否具有新父部门权限避免越权
			this.checkDeptDataScope(dept.getParentId());
			SysDept newParentDept = baseMapper.selectById(dept.getParentId());
			if (ObjectUtil.isNotNull(newParentDept) && ObjectUtil.isNotNull(oldDept)) {
			if (ObjectUtil.isNotNull(newParentDept)) {
			String newAncestors = newParentDept.getAncestors() + StringUtils.SEPARATOR + newParentDept.getDeptId();
			String oldAncestors = oldDept.getAncestors();
			dept.setAncestors(newAncestors);