From 62eb499b0c969f246d3245d1429a97da4de1ce28 Mon Sep 17 00:00:00 2001
From: 钟日健 <arsn163@163.com>
Date: Mon, 01 Jun 2026 20:46:13 +0800
Subject: [PATCH] feat: 成绩查询增加年龄查询返回
---
src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java | 19 +++++++++++++++++--
1 files changed, 17 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 16ca03a..556ceba 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
@@ -110,7 +110,7 @@
//获取用户信息,保安，民警
if (null!=userId && !userId.equals("")) {
UserVO user = baseMapper.getUserInfoById(userId);
- if (user.getRoleAlias().equals("公安管理员")){
+ if (user.getRoleAlias().equals("公安管理员") || user.getRoleAlias().equals("民警")){
//公安管理员又分，如果是派出所，只返回当前值
if (user.getDeptName().contains("派出所")){
return ForestNodeMerger.merge(baseMapper.lazyTreeCityOne(tenantId, parentId));
@@ -217,7 +217,7 @@
@Override
public List<Map<Object,String>> selectCount(String name) {
- return baseMapper.selectCount(name);
+ return baseMapper.getCount(name);
}
@Override
@@ -375,4 +375,19 @@
public List<DeptVO> lazyTreeJurisdiction(String jurisdiction, Long parentId) {
return ForestNodeMerger.merge(baseMapper.lazyTreeJurisdiction(jurisdiction,parentId));
}
+
+ /**
+ * 懒加载获取单位树,电子围栏用
+ * @param type 1：本单位 2：分公司 3：服务单位
+ * @param deptId
+ * @return
+ */
+ @Override
+ public List<DeptVO> lazyTreeRail(Integer type, Long deptId) {
+ //查询本单位
+ if(type==1 || type==2){
+ return ForestNodeMerger.merge(baseMapper.securityDeptUnitList(null,deptId));
+ }
+ return ForestNodeMerger.merge(baseMapper.getDispatchUnitList(deptId));
+ }
}
--
Gitblit v1.9.3