From d50e7a3d178a7f05852207d4525b258c826117ac Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期六, 08 五月 2021 23:39:50 +0800
Subject: [PATCH] !30 同步dev分支 Merge pull request !30 from 疯狂的狮子li/dev
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java | 10 +---------
1 files changed, 1 insertions(+), 9 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 98616e8..f25a90d 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
@@ -48,15 +48,7 @@
@Override
@DataScope(deptAlias = "d")
public List<SysDept> selectDeptList(SysDept dept) {
- Object dataScope = dept.getParams().get("dataScope");
- return list(new LambdaQueryWrapper<SysDept>()
- .eq(dept.getParentId() != null && dept.getParentId() != 0,
- SysDept::getParentId, dept.getParentId())
- .like(StrUtil.isNotBlank(dept.getDeptName()), SysDept::getDeptName, dept.getDeptName())
- .eq(StrUtil.isNotBlank(dept.getStatus()), SysDept::getStatus, dept.getStatus())
- .apply(dataScope != null, dataScope != null ? dataScope.toString() : null)
- .orderByAsc(SysDept::getParentId)
- .orderByAsc(SysDept::getOrderNum));
+ return baseMapper.selectDeptList(dept);
}
/**
--
Gitblit v1.9.3