数据权限拦截器优化

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/interceptors/PermissionInterceptor.java

@@ -79,26 +79,13 @@ public class PermissionInterceptor implements Interceptor {
         if(!ValidationUtil.isEmpty(dataAuth)){
             dataAuthRule = !ValidationUtil.isEmpty(dataAuthRule) ? dataAuthRule : dataAuth.interfacePath();
         }
-        // 数据权限地址为空返回空数据
-        if(ValidationUtil.isEmpty(dataAuthRule)){
-            // method.getReturnType().isPrimitive() = true 是count语句
-            PermissionInterceptorContext.clean();
-            return method.getReturnType().isPrimitive() ? invocation.proceed() : null;
-        }
         ReginParams reginParam = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId()
                 , RequestContext.getToken())).toString(), ReginParams.class);
-        if (ValidationUtil.isEmpty(reginParam) || ValidationUtil.isEmpty(reginParam.getUserModel())) {
-            // method.getReturnType().isPrimitive() = true 是count语句
-            PermissionInterceptorContext.clean();
-            return method.getReturnType().isPrimitive() ? invocation.proceed() : null;
-        }
         // 用户数据权限配置信息
-        Map<String, List<PermissionDataruleModel>> dataAuthorization = Privilege.permissionDataruleClient.queryByUser(reginParam.getUserModel().getUserId(),
+        Map<String, List<PermissionDataruleModel>> dataAuthorization = null;
+        if (!ValidationUtil.isEmpty(reginParam) && !ValidationUtil.isEmpty(reginParam.getUserModel())) {
+            dataAuthorization = Privilege.permissionDataruleClient.queryByUser(reginParam.getUserModel().getUserId(),
                     dataAuthRule).getResult();
-        // 没有数据权限直接返回空数据
-        if (ValidationUtil.isEmpty(dataAuthorization)) {
-            PermissionInterceptorContext.clean();
-            return method.getReturnType().isPrimitive() ? invocation.proceed() : null;
         }
 
         BoundSql boundSql = (BoundSql) metaObject.getValue("delegate.boundSql");
@@ -194,6 +181,9 @@ public class PermissionInterceptor implements Interceptor {
                 mainTable : selectBody.getFromItem().getAlias().getName();
 
         String authSql;
+        if (ValidationUtil.isEmpty(dataAuthorization)) {
+            authSql = falseCondition;
+        } else {
             // 过滤没有配置数据权限的用户组
             Map<String, List<PermissionDataruleModel>> nonEmptyDataAuthorization =
                     dataAuthorization.entrySet().stream().filter(map -> !ValidationUtil.isEmpty(map.getValue())).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
@@ -204,6 +194,7 @@ public class PermissionInterceptor implements Interceptor {
                 // 解析数据权限sql
                 authSql = parseDataAuthorization(nonEmptyDataAuthorization, reginParams, mainTableAlias, boundSql);
             }
+        }
         // 替换数据权限
         if (!ValidationUtil.isEmpty(authSql)) {
             if (ValidationUtil.isEmpty(selectBody.getWhere())) {

amos-boot-system-supervision/src/main/resources/db/mapper/dbTemplate_check.xml

@@ -2041,12 +2041,12 @@
             <!--            <if test="orgCode != null">-->
             <!--                AND c.org_code = #{orgCode}-->
             <!--            </if>-->
+        </where>
         ORDER BY c.check_time DESC
         <choose>
             <when test="pageSize==-1"></when>
             <when test="pageSize!=-1">limit #{offset},#{pageSize}</when>
         </choose>
-        </where>
     </select>
 
     <select id="getCheckListByTaskId" resultType="com.yeejoin.amos.supervision.dao.entity.Check">