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 filterOcrBuildLogTables = getNeedFilterLeftExpression(plainSelect, ocrBuildLogTables, ds); if (CollUtil.isNotEmpty(filterOcrBuildLogTables)) { List 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 { /** 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 getEnterpriseInfoList(Map map) { if (systemUserService.isSubProject()) { List enterpriseIds = userEnterpriseService.getEnterpriseIdsIfSubProject(); - if (enterpriseIds == null) { - return null; - } - map.put("enterpriseIds", enterpriseIds); + enterpriseIds.add("0"); + map.put("enterpriseIds", StrUtil.join(",", enterpriseIds)); } List securityRegionIdList = MapUtil.getList(map, "securityRegionIdList", String.class); if (CollUtil.isNotEmpty(securityRegionIdList)) {