lbqms.git - Gitblit

			@@ -1,6 +1,5 @@
			package com.ruoyi.system.service.impl;

			import cn.hutool.core.bean.BeanUtil;
			import cn.hutool.core.collection.CollUtil;
			import cn.hutool.core.convert.Convert;
			import cn.hutool.core.lang.tree.Tree;
			@@ -12,6 +11,7 @@
			import com.ruoyi.common.core.constant.UserConstants;
			import com.ruoyi.common.core.exception.ServiceException;
			import com.ruoyi.common.core.service.DeptService;
			import com.ruoyi.common.core.utils.MapstructUtils;
			import com.ruoyi.common.core.utils.SpringUtils;
			import com.ruoyi.common.core.utils.StringUtils;
			import com.ruoyi.common.core.utils.TreeBuildUtils;
			@@ -64,12 +64,11 @@
			/**
			* 查询部门树结构信息
			*
			* @param dept 部门信息
			* @param bo 部门信息
			* @return 部门树信息集合
			*/
			@Override
			public List<Tree<Long>> selectDeptTreeList(SysDept dept) {
			SysDeptBo bo = BeanUtil.toBean(dept, SysDeptBo.class);
			public List<Tree<Long>> selectDeptTreeList(SysDeptBo bo) {
			LambdaQueryWrapper<SysDept> lqw = buildQueryWrapper(bo);
			List<SysDept> depts = baseMapper.selectList(lqw);
			return buildDeptTreeSelect(depts);
			@@ -239,7 +238,7 @@
			if (!UserConstants.DEPT_NORMAL.equals(info.getStatus())) {
			throw new ServiceException("部门停用，不允许新增");
			}
			SysDept dept = BeanUtil.toBean(bo, SysDept.class);
			SysDept dept = MapstructUtils.convert(bo, SysDept.class);
			dept.setAncestors(info.getAncestors() + StringUtils.SEPARATOR + dept.getParentId());
			return baseMapper.insert(dept);
			}
			@@ -253,7 +252,7 @@
			@CacheEvict(cacheNames = CacheNames.SYS_DEPT, key = "#bo.deptId")
			@Override
			public int updateDept(SysDeptBo bo) {
			SysDept dept = BeanUtil.toBean(bo, SysDept.class);
			SysDept dept = MapstructUtils.convert(bo, SysDept.class);
			SysDept newParentDept = baseMapper.selectById(dept.getParentId());
			SysDept oldDept = baseMapper.selectById(dept.getDeptId());
			if (ObjectUtil.isNotNull(newParentDept) && ObjectUtil.isNotNull(oldDept)) {