admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ocr和施工日志bug修改

Browse Source
This commit is contained in:
guoshengxiong 2025-07-25 18:20:39 +08:00
parent 1b0fb0331b
commit 73370c8af0
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/zhgd/mybatis/DataScopeHandler.java
View File

@ -191,6 +191,7 @@ public class DataScopeHandler implements DataPermissionHandler {
List<String> filterOcrBuildLogTables = getNeedFilterLeftExpression(plainSelect, ocrBuildLogTables, ds); List<String> filterOcrBuildLogTables = getNeedFilterLeftExpression(plainSelect, ocrBuildLogTables, ds);
if (CollUtil.isNotEmpty(filterOcrBuildLogTables)) { if (CollUtil.isNotEmpty(filterOcrBuildLogTables)) {
List<String> ids = ocrBuildLogService.getIdsIfSubProject().stream().map(Convert::toStr).collect(Collectors.toList()); List<String> ids = ocrBuildLogService.getIdsIfSubProject().stream().map(Convert::toStr).collect(Collectors.toList());
ids.add("0");
for (String filterEnterprise : filterOcrBuildLogTables) { for (String filterEnterprise : filterOcrBuildLogTables) {
inExpression(filterEnterprise, ids, plainSelect); inExpression(filterEnterprise, ids, plainSelect);
} }

2
src/main/java/com/zhgd/xmgl/modules/ocr/mapper/OcrBuildLogMapper.java
View File

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.OcrBuildLog;
import com.zhgd.xmgl.modules.ocr.entity.vo.OcrBuildLogVo; import com.zhgd.xmgl.modules.ocr.entity.vo.OcrBuildLogVo;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@ -20,6 +21,7 @@ import java.util.List;
* @version： V1.0 * @version： V1.0
*/ */
@Mapper @Mapper
@DataScope(includeTable = "ocr_build_log")
public interface OcrBuildLogMapper extends BaseMapper<OcrBuildLog> { public interface OcrBuildLogMapper extends BaseMapper<OcrBuildLog> {
/** /**

6
src/main/java/com/zhgd/xmgl/modules/worker/service/impl/EnterpriseInfoServiceImpl.java
View File

@ -161,10 +161,8 @@ public class EnterpriseInfoServiceImpl extends ServiceImpl<EnterpriseInfoMapper,
public List<EntityMap> getEnterpriseInfoList(Map<String, Object> map) { public List<EntityMap> getEnterpriseInfoList(Map<String, Object> map) {
if (systemUserService.isSubProject()) { if (systemUserService.isSubProject()) {
List<String> enterpriseIds = userEnterpriseService.getEnterpriseIdsIfSubProject(); List<String> enterpriseIds = userEnterpriseService.getEnterpriseIdsIfSubProject();
if (enterpriseIds == null) { enterpriseIds.add("0");
return null; map.put("enterpriseIds", StrUtil.join(",", enterpriseIds));
}
map.put("enterpriseIds", enterpriseIds);
} }
List<String> securityRegionIdList = MapUtil.getList(map, "securityRegionIdList", String.class); List<String> securityRegionIdList = MapUtil.getList(map, "securityRegionIdList", String.class);
if (CollUtil.isNotEmpty(securityRegionIdList)) { if (CollUtil.isNotEmpty(securityRegionIdList)) {