diff --git a/backend/src/main/java/com/yfd/platform/qgc_sys/mapLayer/mapper/MsMapmoduleBMapper.java b/backend/src/main/java/com/yfd/platform/qgc_sys/mapLayer/mapper/MsMapmoduleBMapper.java index d0858123..80126161 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_sys/mapLayer/mapper/MsMapmoduleBMapper.java +++ b/backend/src/main/java/com/yfd/platform/qgc_sys/mapLayer/mapper/MsMapmoduleBMapper.java @@ -102,7 +102,7 @@ public interface MsMapmoduleBMapper extends BaseMapper { + "BMM.MULTI_SELECT AS multiSelect, BMM.CHECKED AS checked, BMM.CAN_BE_CHECKED AS canBeChecked, " + "BMM.ORDER_INDEX AS pSort " + "FROM MS_MAPLEGEND_B BML LEFT JOIN MS_MAPMODULE_B BMM ON BML.ID = BMM.RES_ID " - + "WHERE BMM.RES_TYPE = 'legend' AND BML.IS_DELETED = 0 AND BML.ENABLE = 1 " + + "WHERE BMM.RES_TYPE = 'legend' AND BMM.IS_DELETED = 0 AND BML.IS_DELETED = 0 AND BML.ENABLE = 1 " + "" + " AND BMM.MODULE_ID = #{moduleId}" + " AND BMM.MODULE_ID = 'common'" 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 4422193a..dc0d0a9f 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 @@ -1,4 +1,5 @@ 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; @@ -48,6 +49,7 @@ public class MapmoduleBController { @Resource private MsMaplayerBMapper msMaplayerBMapper; + /** * 条件过滤数据列表(Kendo UI 数据源) */ @@ -160,9 +162,9 @@ public class MapmoduleBController { moduleWrapper.eq(MsMapmoduleB::getResType, "layer"); moduleWrapper.eq(MsMapmoduleB::getResId, layer.getId()); moduleWrapper.eq(MsMapmoduleB::getIsDeleted, 0); - MsMapmoduleB existingLayerModule = mapmoduleBService.getOne(moduleWrapper); - - if (existingLayerModule == null) { + long count = mapmoduleBService.count(moduleWrapper); + + if (count <= 0) { MsMapmoduleB layerModule = new MsMapmoduleB(); layerModule.setModuleId(mapmoduleB.getModuleId()); layerModule.setSystemId(mapmoduleB.getSystemId());