From c471eb8b620eea8b90a4a9d61f3e832d4421bf9e Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Mon, 30 Sep 2024 16:54:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hnac/gglm/bigmodel/business/service/DataSourceService.java | 2 +- .../java/com/hnac/hzinfo/inspect/plan/controller/PlanController.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/business/service/DataSourceService.java b/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/business/service/DataSourceService.java index cc44b07..93e7916 100644 --- a/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/business/service/DataSourceService.java +++ b/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/business/service/DataSourceService.java @@ -53,7 +53,7 @@ public class DataSourceService { for (TableAuthVO tableAuthVO : sqlVO.getTableAuthVOList()) { // 查询改数据源下的表格是否存在鉴权 LambdaQueryWrapper wrapper = Wrappers.lambdaQuery() - .eq(TablePropertyEntity::getDatasourceId, tableAuthVO.getDatasourceName()) + //.eq(TablePropertyEntity::getDatasourceId, tableAuthVO.getDatasourceName()) .eq(TablePropertyEntity::getTableName, tableAuthVO.getTableName()); List propertise = tablePropertyService.list(wrapper); Assert.isTrue(Func.isNotEmpty(propertise), () -> { diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/PlanController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/PlanController.java index 6106a16..6b211c9 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/PlanController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/PlanController.java @@ -218,7 +218,9 @@ public class PlanController extends BladeController { throw new HzServiceException("未获取到机器人配置！"); } // 获取机器人巡检路线 - List routeEntityList = routeService.list(Wrappers.lambdaQuery().eq(RouteEntity::getCreateDept, UserCache.getUser(robotEntity.getUserId()).getDeptId())); + List routeEntityList = routeService.list(Wrappers.lambdaQuery() + .eq(RouteEntity::getCreateDept, UserCache.getUser(robotEntity.getUserId()).getDeptId()) + .eq(RouteEntity::getSupportAutoVideo, Constants.InspectTypeEnum.ROBOT.getVal())); if(CollectionUtil.isEmpty(routeEntityList)) { throw new HzServiceException("获取机器人巡检路线失败！"); }