From c5857a50d688d0c42b3893854e6f30dc45e61ca9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 11 十一月 2024 22:32:12 +0800
Subject: [PATCH] 代码提交
---
xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/service/impl/SysDeptServiceImpl.java | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/service/impl/SysDeptServiceImpl.java b/xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/service/impl/SysDeptServiceImpl.java
index f83e1ef..7da06b5 100644
--- a/xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/service/impl/SysDeptServiceImpl.java
+++ b/xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/service/impl/SysDeptServiceImpl.java
@@ -5,6 +5,7 @@
import java.util.List;
import java.util.stream.Collectors;
+import com.xinquan.common.core.web.page.PageInfo;
import com.xinquan.system.domain.vo.TreeSelect;
import com.xinquan.system.mapper.SysDeptMapper;
import com.xinquan.system.mapper.SysRoleMapper;
@@ -46,6 +47,7 @@
@DataScope(deptAlias = "d")
public List<SysDept> selectDeptList(SysDept dept)
{
+
return deptMapper.selectDeptList(dept);
}
@@ -174,9 +176,20 @@
@Override
public boolean checkDeptNameUnique(SysDept dept)
{
- Long deptId = StringUtils.isNull(dept.getDeptId()) ? -1L : dept.getDeptId();
- SysDept info = deptMapper.checkDeptNameUnique(dept.getDeptName(), dept.getParentId());
- if (StringUtils.isNotNull(info) && info.getDeptId().longValue() != deptId.longValue())
+
+ SysDept info = deptMapper.checkDeptNameUnique(dept.getDeptCode());
+ if (StringUtils.isNotNull(info))
+ {
+ return UserConstants.NOT_UNIQUE;
+ }
+ return UserConstants.UNIQUE;
+ }
+ @Override
+ public boolean checkDeptNameUnique1(SysDept dept)
+ {
+
+ SysDept info = deptMapper.checkDeptNameUnique1(dept.getDeptCode(),dept.getDeptId());
+ if (StringUtils.isNotNull(info))
{
return UserConstants.NOT_UNIQUE;
}
@@ -212,13 +225,6 @@
@Override
public int insertDept(SysDept dept)
{
- SysDept info = deptMapper.selectDeptById(dept.getParentId());
- // 如果父节点不为正常状态,则不允许新增子节点
- if (!UserConstants.DEPT_NORMAL.equals(info.getStatus()))
- {
- throw new ServiceException("部门停用，不允许新增");
- }
- dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
return deptMapper.insertDept(dept);
}
@@ -294,6 +300,12 @@
return deptMapper.deleteDeptById(deptId);
}
+ @Override
+ public List<SysDept> getList(PageInfo<SysDept> pageInfo, String deptName) {
+ List<SysDept> list= deptMapper.getList(pageInfo,deptName);
+ return list;
+ }
+
/**
* 递归列表
*/
--
Gitblit v1.7.1