RuoYi
2021-07-30 66e0f9a53d471daff7c54f1c091eac297666e38a
启用部门状态排除顶级节点
2 files modified
5 ■■■■■ changed files
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java 3 ●●●● patch | view | raw | blame | history
ruoyi-ui/src/utils/request.js 2 ●●● patch | view | raw | blame | history
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
@@ -209,7 +209,8 @@
            updateDeptChildren(dept.getDeptId(), newAncestors, oldAncestors);
        }
        int result = deptMapper.updateDept(dept);
        if (UserConstants.DEPT_NORMAL.equals(dept.getStatus()))
        if (UserConstants.DEPT_NORMAL.equals(dept.getStatus()) && StringUtils.isNotEmpty(dept.getAncestors())
                && !StringUtils.equals("0", dept.getAncestors()))
        {
            // 如果该部门是启用状态,则启用该部门的所有上级部门
            updateParentDeptStatusNormal(dept);
ruoyi-ui/src/utils/request.js
@@ -51,7 +51,7 @@
          location.href = '/index';
        })
      }).catch(() => {});
      return Promise.reject('error')
      return Promise.reject()
    } else if (code === 500) {
      Message({
        message: msg,