From d8103e5da17cd3dc9fb16abc223b6adcf93f0383 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 12 Aug 2021 14:26:30 +0800
Subject: [PATCH] 培训列表接口修改，帅选出已报名培训的数据
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 99ac878..c08be41 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -452,13 +452,15 @@
public List<TreeNode> getSecurityApplyTree(UserVO user) {
Map<Long,TreeNode> map = baseMapper.getSecurityApplyTree(user);
List<TreeNode> tree = new ArrayList<>();
- map.forEach((id,treeNode) ->{
- if (map.containsKey(treeNode.getParentId())){
- map.get(treeNode.getParentId()).getChildren().add(treeNode);
- }else {
- tree.add(treeNode);
- }
- });
+ if (map.size()>1){
+ map.forEach((id,treeNode) ->{
+ if (map.containsKey(treeNode.getParentId())){
+ map.get(treeNode.getParentId()).getChildren().add(treeNode);
+ }else {
+ tree.add(treeNode);
+ }
+ });
+ }
return tree;
}
@@ -466,4 +468,14 @@
public List<Map<Object, Object>> selectInr(String deptid) {
return baseMapper.selectInr(deptid);
}
+
+ /**
+ * 查询当前年份已有的保安证编号
+ * @param pre 前缀
+ * @return
+ */
+ @Override
+ public int getSecurityPaperCount(String pre) {
+ return baseMapper.getSecurityPaperCount(pre);
+ }
}
--
Gitblit v1.9.3