mirror of https://gitee.com/y_project/RuoYi.git
优化部门启用状态
parent
dcf28440f7
commit
d431e50bdf
|
@ -93,11 +93,11 @@ public interface SysDeptMapper
|
||||||
public List<String> selectRoleDeptTree(Long roleId);
|
public List<String> selectRoleDeptTree(Long roleId);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 修改所在部门的父级部门状态
|
* 修改所在部门正常状态
|
||||||
*
|
*
|
||||||
* @param dept 部门
|
* @param deptIds 部门ID组
|
||||||
*/
|
*/
|
||||||
public void updateDeptStatus(SysDept dept);
|
public void updateDeptStatusNormal(Long[] deptIds);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据ID查询所有子部门
|
* 根据ID查询所有子部门
|
||||||
|
|
|
@ -12,6 +12,7 @@ import com.ruoyi.common.constant.UserConstants;
|
||||||
import com.ruoyi.common.core.domain.Ztree;
|
import com.ruoyi.common.core.domain.Ztree;
|
||||||
import com.ruoyi.common.core.domain.entity.SysDept;
|
import com.ruoyi.common.core.domain.entity.SysDept;
|
||||||
import com.ruoyi.common.core.domain.entity.SysRole;
|
import com.ruoyi.common.core.domain.entity.SysRole;
|
||||||
|
import com.ruoyi.common.core.text.Convert;
|
||||||
import com.ruoyi.common.exception.BusinessException;
|
import com.ruoyi.common.exception.BusinessException;
|
||||||
import com.ruoyi.common.utils.StringUtils;
|
import com.ruoyi.common.utils.StringUtils;
|
||||||
import com.ruoyi.system.mapper.SysDeptMapper;
|
import com.ruoyi.system.mapper.SysDeptMapper;
|
||||||
|
@ -229,7 +230,7 @@ public class SysDeptServiceImpl implements ISysDeptService
|
||||||
if (UserConstants.DEPT_NORMAL.equals(dept.getStatus()))
|
if (UserConstants.DEPT_NORMAL.equals(dept.getStatus()))
|
||||||
{
|
{
|
||||||
// 如果该部门是启用状态,则启用该部门的所有上级部门
|
// 如果该部门是启用状态,则启用该部门的所有上级部门
|
||||||
updateParentDeptStatus(dept);
|
updateParentDeptStatusNormal(dept);
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
@ -239,12 +240,11 @@ public class SysDeptServiceImpl implements ISysDeptService
|
||||||
*
|
*
|
||||||
* @param dept 当前部门
|
* @param dept 当前部门
|
||||||
*/
|
*/
|
||||||
private void updateParentDeptStatus(SysDept dept)
|
private void updateParentDeptStatusNormal(SysDept dept)
|
||||||
{
|
{
|
||||||
String updateBy = dept.getUpdateBy();
|
String ancestors = dept.getAncestors();
|
||||||
dept = deptMapper.selectDeptById(dept.getDeptId());
|
Long[] deptIds = Convert.toLongArray(ancestors);
|
||||||
dept.setUpdateBy(updateBy);
|
deptMapper.updateDeptStatusNormal(deptIds);
|
||||||
deptMapper.updateDeptStatus(dept);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -145,14 +145,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
update sys_dept set del_flag = '2' where dept_id = #{deptId}
|
update sys_dept set del_flag = '2' where dept_id = #{deptId}
|
||||||
</delete>
|
</delete>
|
||||||
|
|
||||||
<update id="updateDeptStatus" parameterType="SysDept">
|
<update id="updateDeptStatusNormal" parameterType="Long">
|
||||||
update sys_dept
|
update sys_dept set status = '0' where dept_id in
|
||||||
<set>
|
<foreach collection="array" item="deptId" open="(" separator="," close=")">
|
||||||
<if test="status != null and status != ''">status = #{status},</if>
|
#{deptId}
|
||||||
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
</foreach>
|
||||||
update_time = sysdate()
|
|
||||||
</set>
|
|
||||||
where find_in_set(#{deptId}, ancestors)
|
|
||||||
</update>
|
</update>
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
Loading…
Reference in New Issue