From eeeddf0836a5a5aa03a3342d34318c7202313e93 Mon Sep 17 00:00:00 2001
From: 唐耀东 <18861537@qq.com>
Date: 星期四, 09 十二月 2021 15:02:30 +0800
Subject: [PATCH] 提交代码
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java | 14 +++++++++++++-
1 files changed, 13 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 995bd2d..e8686c1 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
@@ -2,7 +2,9 @@
import cn.hutool.core.convert.Convert;
import cn.hutool.core.lang.tree.Tree;
+import cn.hutool.http.HttpStatus;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.constant.UserConstants;
@@ -175,7 +177,11 @@
SysDept info = getById(dept.getParentId());
// 濡傛灉鐖惰妭鐐逛笉涓烘甯哥姸鎬�,鍒欎笉鍏佽鏂板瀛愯妭鐐�
if (!UserConstants.DEPT_NORMAL.equals(info.getStatus())) {
- throw new ServiceException("閮ㄩ棬鍋滅敤锛屼笉鍏佽鏂板");
+ throw new ServiceException("鏈烘瀯鍋滅敤锛屼笉鍏佽鏂板");
+ }
+ List<SysDept> list = baseMapper.selectList(new QueryWrapper<SysDept>().lambda().eq(SysDept::getCode, dept.getCode()));
+ if (list.size() > 0) {
+ throw new ServiceException("鏈烘瀯缂栧彿閲嶅", HttpStatus.HTTP_PARTIAL);
}
dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
return baseMapper.insert(dept);
@@ -189,6 +195,12 @@
*/
@Override
public int updateDept(SysDept dept) {
+ List<SysDept> list = baseMapper.selectList(new QueryWrapper<SysDept>().lambda()
+ .eq(SysDept::getCode, dept.getCode())
+ .ne(SysDept::getDeptId, dept.getDeptId()));
+ if (list.size() > 0) {
+ throw new ServiceException("鏈烘瀯缂栧彿閲嶅", HttpStatus.HTTP_PARTIAL);
+ }
SysDept newParentDept = getById(dept.getParentId());
SysDept oldDept = getById(dept.getDeptId());
if (StringUtils.isNotNull(newParentDept) && StringUtils.isNotNull(oldDept)) {
--
Gitblit v1.9.1