From 6f51f729ba880f452ce915453698845b7df243e9 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Mon, 16 Aug 2021 16:23:27 +0800
Subject: [PATCH] !289 添加日期范围支持重复添加多组日期范围，请求参数中对象的属性为null、undefined不进行拼接 Merge pull request !289 from wangzhaoqiang/master
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
index fe885a0..2b081f9 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
+++ b/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);
--
Gitblit v1.9.2