From fc7a15ffb3fe3382f24d62d800dcde34cdbf724d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 15 Sep 2021 08:47:14 +0800
Subject: [PATCH] 部门信息表，培训报名表新增字段
---
src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
index 3292850..4d94e81 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
@@ -21,6 +21,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.AllArgsConstructor;
import org.springblade.common.cache.SysCache;
+import org.springblade.common.vo.DeptVo;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
@@ -207,10 +208,6 @@
return ForestNodeMerger.merge(baseMapper.securityLazyTree(jurisdiction, parentId));
}
- @Override
- public List<String> selectIn() {
- return baseMapper.selectIn();
- }
/**
* 懒加载获取部门树形结构(包含用户数据)
@@ -259,6 +256,10 @@
if(type==1){
map = baseMapper.lazyTreeUsers(type,deptId,null);
}
+ //查当前公司人员
+ if(type==4){
+ map = baseMapper.lazyTreeUsers(null,deptId,null);
+ }
//保安向民警汇报
if(type==2){
//查询当前保安所在的辖区
@@ -293,4 +294,19 @@
});
return tree;
}
+
+ @Override
+ public List<DeptVO> selectInfo() {
+ return ForestNodeMerger.merge(baseMapper.selectInfo());
+ }
+
+ @Override
+ public List<DeptVo> selDeptList() {
+ return baseMapper.selDeptList();
+ }
+
+ @Override
+ public List<String> selectIn() {
+ return baseMapper.selectIn();
+ }
}
--
Gitblit v1.9.3