From 138cac5008689fadaa96ecac116a2297bb69bc1c Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 04 Mar 2022 10:45:40 +0800
Subject: [PATCH] 1. 电子围栏基本接口新增 2. 保安员证核查申请记录基本接口新增，审批，批量审批接口编写 3. 保安员证档案库新增字段 source 来源，保安员证生成修改

---
 src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 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..0f07443 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));

--
Gitblit v1.9.3