From 28e390975e8055017b0b2078ea292e2ef924fc97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <wangiegie@gmail.com>
Date: Thu, 6 Feb 2020 16:15:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=89=B9=E6=80=A7=EF=BC=9A=20?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=A0=91=E5=A2=9E=E5=8A=A0=20=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=9D=83=E9=99=90=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/pig4cloud/pigx/admin/mapper/SysDeptMapper.java | 10 ++++++++++
 .../pigx/admin/service/impl/SysDeptServiceImpl.java    |  3 ++-
 .../src/main/resources/mapper/SysDeptMapper.xml        |  3 +++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDeptMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDeptMapper.java
index aeb1e4ae5..e83f7335e 100644
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDeptMapper.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDeptMapper.java
@@ -21,6 +21,9 @@ package com.pig4cloud.pigx.admin.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pig4cloud.pigx.admin.api.entity.SysDept;
+import com.pig4cloud.pigx.common.data.datascope.DataScope;
+
+import java.util.List;
 
 /**
  * <p>
@@ -32,4 +35,11 @@ import com.pig4cloud.pigx.admin.api.entity.SysDept;
  */
 public interface SysDeptMapper extends BaseMapper<SysDept> {
 
+	/**
+	 * 根据数据权限查询部门
+	 *
+	 * @param dataScope
+	 * @return
+	 */
+	List<SysDept> listDepts(DataScope dataScope);
 }
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java
index c0bc0e291..345ebca05 100644
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java
@@ -29,6 +29,7 @@ import com.pig4cloud.pigx.admin.api.vo.TreeUtil;
 import com.pig4cloud.pigx.admin.mapper.SysDeptMapper;
 import com.pig4cloud.pigx.admin.service.SysDeptRelationService;
 import com.pig4cloud.pigx.admin.service.SysDeptService;
+import com.pig4cloud.pigx.common.data.datascope.DataScope;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -120,7 +121,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
 	 */
 	@Override
 	public List<DeptTree> selectTree() {
-		return getDeptTree(this.list(Wrappers.emptyWrapper()));
+		return getDeptTree(baseMapper.listDepts(new DataScope()));
 	}
 
 
diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDeptMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDeptMapper.xml
index 7f0befa96..013ef26d3 100644
--- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDeptMapper.xml
+++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDeptMapper.xml
@@ -21,4 +21,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.pig4cloud.pigx.admin.mapper.SysDeptMapper">
 
+	<select id="listDepts" resultType="com.pig4cloud.pigx.admin.api.entity.SysDept">
+		SELECT * FROM sys_dept WHERE del_flag = '0'
+	</select>
 </mapper>