feat:支付宝分账

pjcloud-common/pjcloud-common-data/src/main/java/com/bsd/pjcloud/common/data/datascope/DataScopeInnerInterceptor.java

@@ -2,7 +2,6 @@ package com.bsd.pjcloud.common.data.datascope;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSON;
 import cn.hutool.json.JSONUtil;
@@ -53,19 +52,23 @@ public class DataScopeInnerInterceptor implements DataScopeInterceptor {
 
         List<Long> deptIds = dataScope.getDeptList();
 
-        // 1.无数据权限限制，则直接返回 0 条数据
-        if (CollUtil.isEmpty(deptIds) && StrUtil.isBlank(dataScope.getUsername())) {
+        boolean hasDeptScope = CollUtil.isNotEmpty(deptIds);
+        boolean hasUserScope = StrUtil.isNotBlank(dataScope.getUsername())
+                && StrUtil.isNotBlank(dataScope.getScopeUserName());
+
+        // 1.无可用权限条件时直接返回 0 条数据，避免生成非法的 IN ()，也不能因本人字段被禁用而放开查询。
+        if (!hasDeptScope && !hasUserScope) {
             originalSql = String.format("SELECT %s FROM (%s) temp_data_scope WHERE 1 = 2",
                     dataScope.getFunc().getType(), originalSql);
         }
         // 2.如果为本人权限 + 部门权限控制
-        else if (StrUtil.isNotBlank(dataScope.getUsername()) && ObjectUtil.isNotEmpty(dataScope.getScopeUserName()) && CollUtil.isNotEmpty(deptIds)) {
+        else if (hasUserScope && hasDeptScope) {
             String join = CollectionUtil.join(deptIds, ",");
             originalSql = String.format("SELECT %s FROM (%s) temp_data_scope WHERE temp_data_scope.%s = '%s' OR temp_data_scope.%s IN (%s)",
                     dataScope.getFunc().getType(), originalSql, dataScope.getScopeUserName(), dataScope.getUsername(), dataScope.getScopeDeptName(), join);
         }
         // 3. 如果为本人
-        else if (StrUtil.isNotBlank(dataScope.getUsername()) && ObjectUtil.isNotEmpty(dataScope.getScopeUserName())) {
+        else if (hasUserScope) {
             originalSql = String.format("SELECT %s FROM (%s) temp_data_scope WHERE temp_data_scope.%s = '%s'",
                     dataScope.getFunc().getType(), originalSql, dataScope.getScopeUserName(), dataScope.getUsername());
         }