From 29118ae78c202f4e1f54f3220a69304f2149a97a Mon Sep 17 00:00:00 2001
From: MichelleChung <1242874891@qq.com>
Date: 星期一, 23 十月 2023 09:28:11 +0800
Subject: [PATCH] !433 更新登录日志以及在线用户展示信息 * update 更新登录日志, 在线用户展示信息(增加 客户端, 设备类型)
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java
index 36680e3..aa66705 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java
@@ -69,8 +69,10 @@
*/
@Override
public List<Tree<Long>> selectDeptTreeList(SysDeptBo bo) {
+ // 鍙煡璇㈡湭绂佺敤閮ㄩ棬
+ bo.setStatus(UserConstants.DEPT_NORMAL);
LambdaQueryWrapper<SysDept> lqw = buildQueryWrapper(bo);
- List<SysDept> depts = baseMapper.selectList(lqw);
+ List<SysDeptVo> depts = baseMapper.selectDeptList(lqw);
return buildDeptTreeSelect(depts);
}
@@ -81,6 +83,7 @@
lqw.eq(ObjectUtil.isNotNull(bo.getParentId()), SysDept::getParentId, bo.getParentId());
lqw.like(StringUtils.isNotBlank(bo.getDeptName()), SysDept::getDeptName, bo.getDeptName());
lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysDept::getStatus, bo.getStatus());
+ lqw.orderByAsc(SysDept::getDeptId);
lqw.orderByAsc(SysDept::getParentId);
lqw.orderByAsc(SysDept::getOrderNum);
return lqw;
@@ -93,7 +96,7 @@
* @return 涓嬫媺鏍戠粨鏋勫垪琛�
*/
@Override
- public List<Tree<Long>> buildDeptTreeSelect(List<SysDept> depts) {
+ public List<Tree<Long>> buildDeptTreeSelect(List<SysDeptVo> depts) {
if (CollUtil.isEmpty(depts)) {
return CollUtil.newArrayList();
}
--
Gitblit v1.9.3