From 73370c8af0899acec2c668b0f01bd87ec84f1b00 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Fri, 25 Jul 2025 18:20:39 +0800
Subject: [PATCH] =?UTF-8?q?ocr=E5=92=8C=E6=96=BD=E5=B7=A5=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/zhgd/mybatis/DataScopeHandler.java        | 1 +
 .../com/zhgd/xmgl/modules/ocr/mapper/OcrBuildLogMapper.java | 2 ++
 .../worker/service/impl/EnterpriseInfoServiceImpl.java      | 6 ++----
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zhgd/mybatis/DataScopeHandler.java b/src/main/java/com/zhgd/mybatis/DataScopeHandler.java
index c5f3ef479..288c936fb 100644
--- a/src/main/java/com/zhgd/mybatis/DataScopeHandler.java
+++ b/src/main/java/com/zhgd/mybatis/DataScopeHandler.java
@@ -191,6 +191,7 @@ public class DataScopeHandler implements DataPermissionHandler {
                 List<String> filterOcrBuildLogTables = getNeedFilterLeftExpression(plainSelect, ocrBuildLogTables, ds);
                 if (CollUtil.isNotEmpty(filterOcrBuildLogTables)) {
                     List<String> ids = ocrBuildLogService.getIdsIfSubProject().stream().map(Convert::toStr).collect(Collectors.toList());
+                    ids.add("0");
                     for (String filterEnterprise : filterOcrBuildLogTables) {
                         inExpression(filterEnterprise, ids, plainSelect);
                     }
diff --git a/src/main/java/com/zhgd/xmgl/modules/ocr/mapper/OcrBuildLogMapper.java b/src/main/java/com/zhgd/xmgl/modules/ocr/mapper/OcrBuildLogMapper.java
index d4686ef3d..145450372 100644
--- a/src/main/java/com/zhgd/xmgl/modules/ocr/mapper/OcrBuildLogMapper.java
+++ b/src/main/java/com/zhgd/xmgl/modules/ocr/mapper/OcrBuildLogMapper.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zhgd.annotation.DataScope;
 import com.zhgd.xmgl.modules.ocr.entity.OcrBuildLog;
 import com.zhgd.xmgl.modules.ocr.entity.vo.OcrBuildLogVo;
 import org.apache.ibatis.annotations.Mapper;
@@ -20,6 +21,7 @@ import java.util.List;
  * @version： V1.0
  */
 @Mapper
+@DataScope(includeTable = "ocr_build_log")
 public interface OcrBuildLogMapper extends BaseMapper<OcrBuildLog> {
 
   /**
diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/EnterpriseInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/EnterpriseInfoServiceImpl.java
index 5323d906f..40ff0bf37 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/EnterpriseInfoServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/EnterpriseInfoServiceImpl.java
@@ -161,10 +161,8 @@ public class EnterpriseInfoServiceImpl extends ServiceImpl<EnterpriseInfoMapper,
     public List<EntityMap> getEnterpriseInfoList(Map<String, Object> map) {
         if (systemUserService.isSubProject()) {
             List<String> enterpriseIds = userEnterpriseService.getEnterpriseIdsIfSubProject();
-            if (enterpriseIds == null) {
-                return null;
-            }
-            map.put("enterpriseIds", enterpriseIds);
+            enterpriseIds.add("0");
+            map.put("enterpriseIds", StrUtil.join(",", enterpriseIds));
         }
         List<String> securityRegionIdList = MapUtil.getList(map, "securityRegionIdList", String.class);
         if (CollUtil.isNotEmpty(securityRegionIdList)) {