From 19f40c8e0649ae81b3f0183a6f4c8aa6c3db39bc Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 18 Nov 2021 17:54:37 +0800
Subject: [PATCH] 证书打印信息导出修改,已过考试的，系统每天凌晨1点定时清理，标记为缺考，并生成缺考记录，保安员导入新增年龄判断，超过60岁的不能导入
---
src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 d5ab8c6..8763098 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
@@ -121,6 +121,10 @@
if (dept.getParentId().equals(1123598813738675201L)) {
return ForestNodeMerger.merge(baseMapper.lazyTreeCity(tenantId, parentId));
}
+ if (dept.getParentId().equals(0L)){
+ //南昌市公安局
+ return ForestNodeMerger.merge(baseMapper.lazyTreeByJurisdiction());
+ }
}
}
}else {
@@ -129,9 +133,8 @@
}
}
//admin
- return ForestNodeMerger.merge(baseMapper.lazyTree(tenantId, parentId));
+ return ForestNodeMerger.merge(baseMapper.lazyTree(tenantId, parentId,null));
}
-
@Override
public List<DeptVO> lazyTrees() {
return ForestNodeMerger.merge(baseMapper.lazyTrees());
@@ -324,6 +327,11 @@
}
@Override
+ public List<DeptVO> selectInfos() {
+ return baseMapper.selectInfos();
+ }
+
+ @Override
public List<DeptVo> selDeptList() {
return baseMapper.selDeptList();
}
--
Gitblit v1.9.3