From 2c99eb1b27b9fbad752aaeab8783399af32514e6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 15 一月 2025 21:00:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
index 3f9f7e9..2b26388 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
@@ -228,13 +228,13 @@
@Override
public int insertDept(SysDept dept)
{
- SysDept info = deptMapper.selectDeptById(dept.getParentId());
- // 如果父节点不为正常状态,则不允许新增子节点
- if (null != info && !UserConstants.DEPT_NORMAL.equals(info.getStatus()))
- {
- throw new ServiceException("部门停用，不允许新增");
- }
- dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
+// SysDept info = deptMapper.selectDeptById(dept.getParentId());
+// // 如果父节点不为正常状态,则不允许新增子节点
+// if (null != info && !UserConstants.DEPT_NORMAL.equals(info.getStatus()))
+// {
+// throw new ServiceException("部门停用，不允许新增");
+// }
+// dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
//判断店铺数据
Long userid = tokenService.getLoginUser().getUserid();
SysUser sysUser = sysUserService.getById(userid);
@@ -253,14 +253,14 @@
@Override
public int updateDept(SysDept dept)
{
- SysDept newParentDept = deptMapper.selectDeptById(dept.getParentId());
- SysDept oldDept = deptMapper.selectDeptById(dept.getDeptId());
- if (StringUtils.isNotNull(newParentDept) && StringUtils.isNotNull(oldDept)) {
- String newAncestors = newParentDept.getAncestors() + "," + newParentDept.getDeptId();
- String oldAncestors = oldDept.getAncestors();
- dept.setAncestors(newAncestors);
- updateDeptChildren(dept.getDeptId(), newAncestors, oldAncestors);
- }
+// SysDept newParentDept = deptMapper.selectDeptById(dept.getParentId());
+// SysDept oldDept = deptMapper.selectDeptById(dept.getDeptId());
+// if (StringUtils.isNotNull(newParentDept) && StringUtils.isNotNull(oldDept)) {
+// String newAncestors = newParentDept.getAncestors() + "," + newParentDept.getDeptId();
+// String oldAncestors = oldDept.getAncestors();
+// dept.setAncestors(newAncestors);
+// updateDeptChildren(dept.getDeptId(), newAncestors, oldAncestors);
+// }
//判断店铺数据
Long userid = tokenService.getLoginUser().getUserid();
SysUser sysUser = sysUserService.getById(userid);
--
Gitblit v1.7.1