From ee5b60c2c7b661fd2b6934427a57b30650852886 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Mon, 27 Apr 2020 13:42:57 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9@Datafilter=E6=B3=A8?=
 =?UTF-8?q?=E8=A7=A3=EF=BC=8C=E5=B0=86tableAlias=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E6=95=B0=E7=BB=84=EF=BC=8C=E9=A2=84=E7=95=99=E5=87=BA?=
 =?UTF-8?q?=E6=9D=A5=EF=BC=8C=E4=B8=BA=E5=90=8E=E9=9D=A2=E7=9A=84=E5=A4=9A?=
 =?UTF-8?q?=E8=A1=A8=E8=BF=87=E6=BB=A4=E5=81=9A=E5=87=86=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/commons/mybatis/annotation/DataFilter.java  | 2 +-
 .../com/epmet/commons/mybatis/aspect/DataFilterAspect.java     | 3 ++-
 .../src/main/java/com/epmet/dao/StaffRoleDao.java              | 3 +++
 .../main/java/com/epmet/service/impl/StaffRoleServiceImpl.java | 2 --
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/annotation/DataFilter.java b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/annotation/DataFilter.java
index 96b7691f22..6947d92619 100644
--- a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/annotation/DataFilter.java
+++ b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/annotation/DataFilter.java
@@ -23,6 +23,6 @@ public @interface DataFilter {
     /**
      * 表的别名
      */
-    String tableAlias() default "";
+    String[] tableAliases() default "";
 
 }
diff --git a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/aspect/DataFilterAspect.java b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/aspect/DataFilterAspect.java
index c9965192cf..a7c5fc1683 100644
--- a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/aspect/DataFilterAspect.java
+++ b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/aspect/DataFilterAspect.java
@@ -71,7 +71,8 @@ public class DataFilterAspect {
 
         // 通过反射，取到注解属性
         DataFilter dataFilterAnno = ((MethodSignature) point.getSignature()).getMethod().getAnnotation(DataFilter.class);
-        String tableAlias = dataFilterAnno.tableAlias();
+        String[] tableAliases = dataFilterAnno.tableAliases();
+        String tableAlias = tableAliases[0];
 
         // 从ThreadLocal中取所需权限
         String requirePermission = AccessOpeAspect.requirePermissionTl.get();
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java
index 85dae3de67..b943b44be7 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java
@@ -17,6 +17,7 @@
 
 package com.epmet.dao;
 
+import com.epmet.commons.mybatis.annotation.DataFilter;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.commons.mybatis.entity.DataScope;
 import com.epmet.dto.StaffRoleDTO;
@@ -44,6 +45,7 @@ public interface StaffRoleDao extends BaseDao<StaffRoleEntity> {
      * @param orgId
      * @return
      */
+    //@DataFilter(tableAliases = { "sr" })
     List<GovStaffRoleResultDTO> listStaffIdsByRoleKeyAndOrgId(@Param("roleKey") String roleKey, @Param("orgId") String orgId,
                                                               @Param("dataScope") DataScope dataScope);
 
@@ -61,6 +63,7 @@ public interface StaffRoleDao extends BaseDao<StaffRoleEntity> {
      * @Author wangc
      * @Date 2020.04.26 11:01
      **/
+    //@DataFilter(tableAliases = { "role" })
     StaffRolesResultDTO getStaffRoles(CommonUserFormDTO commonUserFormDTO);
 
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java
index 0c4365e9fb..f76d6545c5 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java
@@ -114,7 +114,6 @@ public class StaffRoleServiceImpl extends BaseServiceImpl<StaffRoleDao, StaffRol
      * @return
      */
     @Override
-    //@DataFilter(tableAlias = "sr")
     public List<GovStaffRoleResultDTO> listStaffsInRole(String roleKey, String orgId, DataScope dataScope) {
         return baseDao.listStaffIdsByRoleKeyAndOrgId(roleKey, orgId, dataScope);
     }
@@ -133,7 +132,6 @@ public class StaffRoleServiceImpl extends BaseServiceImpl<StaffRoleDao, StaffRol
      * @Date 2020.04.26 10:59
      **/
     @Override
-    //@DataFilter(tableAlias = "role")
     public Result<StaffRolesResultDTO> getStaffRoles(CommonUserFormDTO userParam) {
         return new Result<StaffRolesResultDTO>().ok(baseDao.getStaffRoles(userParam));
     }