From c3dbe858b4333158fb746e0bef6e258177bf41c7 Mon Sep 17 00:00:00 2001 From: tangwei Date: Wed, 15 Jul 2026 15:07:07 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../overview/service/impl/OverviewServiceImpl.java | 4 ++++ .../mapcfg/controller/MapmoduleBController.java | 14 +++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/overview/service/impl/OverviewServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/overview/service/impl/OverviewServiceImpl.java index 6dc87d3f..37bc6524 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/overview/service/impl/OverviewServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/overview/service/impl/OverviewServiceImpl.java @@ -1631,6 +1631,10 @@ public class OverviewServiceImpl implements OverviewService { case "pesstdt" -> "t.PESSTDT"; case "swdt" -> "t.SWDT"; case "jcdt" -> "t.JCDT"; + case "baseStepSort" -> "t.BASESTEPSORT"; + case "rvcdStepSort" -> "t.RVCDSTEPSORT"; + case "rstcdStepSort" -> "t.RSTCDSTEPSORT"; + case "siteStepSort" -> "t.SITESTEPSORT"; case "wddt" -> "t.WDDT"; case "orderIndex" -> "t.ORDER_INDEX"; case "remark" -> "t.REMARK"; diff --git a/backend/src/main/java/com/yfd/platform/qgc_sys/mapcfg/controller/MapmoduleBController.java b/backend/src/main/java/com/yfd/platform/qgc_sys/mapcfg/controller/MapmoduleBController.java index 63a368fe..02e72757 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_sys/mapcfg/controller/MapmoduleBController.java +++ b/backend/src/main/java/com/yfd/platform/qgc_sys/mapcfg/controller/MapmoduleBController.java @@ -3,6 +3,7 @@ package com.yfd.platform.qgc_sys.mapcfg.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yfd.platform.common.DataSourceLoadOptionsBase; import com.yfd.platform.common.DataSourceRequest; @@ -175,12 +176,23 @@ public class MapmoduleBController { layerModule.setChildNode(mapmoduleB.getChildNode()); layerModule.setMultiSelect(mapmoduleB.getMultiSelect()); layerModule.setCanBeChecked(mapmoduleB.getCanBeChecked()); - layerModule.setChecked(mapmoduleB.getChecked()); + // 判断mapmoduleB.getChecked() 如果是空则默认为1 + layerModule.setChecked(mapmoduleB.getChecked() == null ? 1 : mapmoduleB.getChecked()); layerModule.setDescription(mapmoduleB.getDescription()); layerModule.setEnable(mapmoduleB.getEnable()); layerModule.setOrderIndex(mapmoduleB.getOrderIndex()); layerModule.setFilterContent(mapmoduleB.getFilterContent()); mapmoduleBService.saveOrUpdate(layerModule); + }else if(count ==1){ + // 走图层修改逻辑 + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(MsMapmoduleB::getModuleId, mapmoduleB.getModuleId()); + updateWrapper.eq(MsMapmoduleB::getSystemId, mapmoduleB.getSystemId()); + updateWrapper.eq(MsMapmoduleB::getResType, "layer"); + updateWrapper.eq(MsMapmoduleB::getResId, layer.getId()); + updateWrapper.eq(MsMapmoduleB::getIsDeleted, 0).set(MsMapmoduleB::getChecked, mapmoduleB.getChecked()); + mapmoduleBService.update(updateWrapper); + } } }