Merge remote-tracking branch 'origin/dev_govorg' into dev_govorg

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 "";
 
 }

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();

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);
 
 }

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));
     }