From 070eabed1429c84f86c1444adc631aa56ceb33c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=BF=E6=B2=90?= <babamu@126.com>
Date: Mon, 30 May 2022 14:55:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../framework/common/service/impl/BaseServiceImpl.java    | 15 ++++++++++++---
 .../net/maku/security/service/FastUserDetailsService.java |  3 +++
 .../net/maku/system/service/impl/SysOrgServiceImpl.java   |  2 +-
 .../net/maku/system/service/impl/SysRoleServiceImpl.java  |  2 ++
 .../net/maku/system/service/impl/SysUserServiceImpl.java  |  2 +-
 fast-boot-system/src/main/resources/mapper/SysMenuDao.xml |  7 ++++---
 fast-boot-system/src/main/resources/mapper/SysUserDao.xml |  3 ---
 7 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/fast-boot-framework/src/main/java/net/maku/framework/common/service/impl/BaseServiceImpl.java b/fast-boot-framework/src/main/java/net/maku/framework/common/service/impl/BaseServiceImpl.java
index 50446ab..626988d 100644
--- a/fast-boot-framework/src/main/java/net/maku/framework/common/service/impl/BaseServiceImpl.java
+++ b/fast-boot-framework/src/main/java/net/maku/framework/common/service/impl/BaseServiceImpl.java
@@ -47,15 +47,21 @@ public class BaseServiceImpl<M extends BaseMapper<T>, T>  extends ServiceImpl<M,
     /**
      * 原生SQL 数据权限
      * @param tableAlias 表别名，多表关联时，需要填写表别名
+     * @param orgIdAlias 机构ID别名，null：表示org_id
      * @return 返回数据权限
      */
-    protected DataScope getDataScope(String tableAlias)  {
+    protected DataScope getDataScope(String tableAlias, String orgIdAlias)  {
         UserDetail user = SecurityUser.getUser();
         // 如果是超级管理员，则不进行数据过滤
         if(user.getSuperAdmin().equals(Constant.SUPER_ADMIN)) {
             return null;
         }
 
+        // 如果为null，则设置成空字符串
+        if(tableAlias == null){
+            tableAlias = "";
+        }
+
         // 获取表的别名
         if(StringUtils.isNotBlank(tableAlias)){
             tableAlias +=  ".";
@@ -72,7 +78,10 @@ public class BaseServiceImpl<M extends BaseMapper<T>, T>  extends ServiceImpl<M,
         }
         // 数据过滤
         if(dataScopeList.size() > 0){
-            sqlFilter.append(tableAlias).append("org_id");
+            if(StringUtils.isBlank(orgIdAlias)){
+                orgIdAlias = "org_id";
+            }
+            sqlFilter.append(tableAlias).append(orgIdAlias);
 
             sqlFilter.append(" in(").append(StrUtil.join(",", dataScopeList)).append(")");
 
@@ -91,7 +100,7 @@ public class BaseServiceImpl<M extends BaseMapper<T>, T>  extends ServiceImpl<M,
      * MyBatis-Plus 数据权限
      */
     protected void dataScopeWrapper(QueryWrapper<T> queryWrapper)  {
-        DataScope dataScope = getDataScope(null);
+        DataScope dataScope = getDataScope(null, null);
         if (dataScope != null){
             queryWrapper.apply(dataScope.getSqlFilter());
         }
diff --git a/fast-boot-system/src/main/java/net/maku/security/service/FastUserDetailsService.java b/fast-boot-system/src/main/java/net/maku/security/service/FastUserDetailsService.java
index e14da9a..af13946 100644
--- a/fast-boot-system/src/main/java/net/maku/security/service/FastUserDetailsService.java
+++ b/fast-boot-system/src/main/java/net/maku/security/service/FastUserDetailsService.java
@@ -90,6 +90,9 @@ public class FastUserDetailsService implements UserDetailsService {
             dataScopeList.addAll(sysRoleDataScopeDao.getDataScopeList(userDetail.getId()));
 
             return dataScopeList;
+        } else if (dataScope.equals(DataScopeEnum.CUSTOM.getValue())) {
+            // 自定义数据权限范围
+            return sysRoleDataScopeDao.getDataScopeList(userDetail.getId());
         }
 
         return new ArrayList<>();
diff --git a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysOrgServiceImpl.java b/fast-boot-system/src/main/java/net/maku/system/service/impl/SysOrgServiceImpl.java
index 7171b02..0b5f4be 100644
--- a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysOrgServiceImpl.java
+++ b/fast-boot-system/src/main/java/net/maku/system/service/impl/SysOrgServiceImpl.java
@@ -36,7 +36,7 @@ public class SysOrgServiceImpl extends BaseServiceImpl<SysOrgDao, SysOrgEntity>
 		Map<String, Object> params = new HashMap<>();
 
 		// 数据权限
-		params.put(Constant.DATA_SCOPE, getDataScope("t1"));
+		params.put(Constant.DATA_SCOPE, getDataScope("t1", "id"));
 
 		// 机构列表
 		List<SysOrgEntity> entityList = baseMapper.getList(params);
diff --git a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysRoleServiceImpl.java b/fast-boot-system/src/main/java/net/maku/system/service/impl/SysRoleServiceImpl.java
index 8e1a514..31fb1d2 100644
--- a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysRoleServiceImpl.java
+++ b/fast-boot-system/src/main/java/net/maku/system/service/impl/SysRoleServiceImpl.java
@@ -9,6 +9,7 @@ import net.maku.framework.common.service.impl.BaseServiceImpl;
 import net.maku.system.convert.SysRoleConvert;
 import net.maku.system.dao.SysRoleDao;
 import net.maku.system.entity.SysRoleEntity;
+import net.maku.system.enums.DataScopeEnum;
 import net.maku.system.service.SysRoleDataScopeService;
 import net.maku.system.service.SysRoleMenuService;
 import net.maku.system.service.SysRoleService;
@@ -62,6 +63,7 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleDao, SysRoleEntit
 		SysRoleEntity entity = SysRoleConvert.INSTANCE.convert(vo);
 
 		// 保存角色
+		entity.setDataScope(DataScopeEnum.CUSTOM.getValue());
 		baseMapper.insert(entity);
 
 		// 保存角色菜单关系
diff --git a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysUserServiceImpl.java b/fast-boot-system/src/main/java/net/maku/system/service/impl/SysUserServiceImpl.java
index b482337..fee1af4 100644
--- a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysUserServiceImpl.java
+++ b/fast-boot-system/src/main/java/net/maku/system/service/impl/SysUserServiceImpl.java
@@ -55,7 +55,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
         params.put("gender", query.getGender());
 
         // 数据权限
-        params.put(Constant.DATA_SCOPE, getDataScope("t1"));
+        params.put(Constant.DATA_SCOPE, getDataScope("t1", null));
 
         return params;
     }
diff --git a/fast-boot-system/src/main/resources/mapper/SysMenuDao.xml b/fast-boot-system/src/main/resources/mapper/SysMenuDao.xml
index 7ca4e49..4fcb085 100644
--- a/fast-boot-system/src/main/resources/mapper/SysMenuDao.xml
+++ b/fast-boot-system/src/main/resources/mapper/SysMenuDao.xml
@@ -15,7 +15,7 @@
 		select t3.* from sys_user_role t1
 			left join sys_role_menu t2 on t1.role_id = t2.role_id
 			left join sys_menu t3 on t2.menu_id = t3.id
-		where t1.user_id = #{userId} and t3.deleted = 0
+		where t1.user_id = #{userId} and t1.deleted = 0 and t3.deleted = 0
 		<if test="type != null">
 			and t3.type = #{type}
 		</if>
@@ -23,9 +23,10 @@
 	</select>
 
 	<select id="getUserAuthorityList" resultType="string">
-		select t3.authority from sys_user_role t1 left join sys_role_menu t2 on t1.role_id = t2.role_id
+		select t3.authority from sys_user_role t1
+		    left join sys_role_menu t2 on t1.role_id = t2.role_id
 			left join sys_menu t3 on t2.menu_id = t3.id
-		where t1.user_id = #{userId} and t3.deleted = 0 order by t3.sort asc
+		where t1.user_id = #{userId} and t1.deleted = 0 and t3.deleted = 0 order by t3.sort asc
 	</select>
 
 	<select id="getAuthorityList" resultType="string">
diff --git a/fast-boot-system/src/main/resources/mapper/SysUserDao.xml b/fast-boot-system/src/main/resources/mapper/SysUserDao.xml
index eb1bb37..5e329f1 100644
--- a/fast-boot-system/src/main/resources/mapper/SysUserDao.xml
+++ b/fast-boot-system/src/main/resources/mapper/SysUserDao.xml
@@ -15,9 +15,6 @@
 		<if test="gender != null">
 			and t1.gender = #{gender}
 		</if>
-		<if test="dataScope != null">
-			${dataScope}
-		</if>
 	</select>
 
 	<select id="getById" resultType="net.maku.system.entity.SysUserEntity">