zhengsl/WholeProcessPlatform
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: 优化逻辑

Browse Source
This commit is contained in:
tangwei 2026-07-02 16:43:22 +08:00
parent 43b2559f6b
commit 716ee0bfa9
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/com/yfd/platform/qgc_sys/mapLayer/mapper/MsMapmoduleBMapper.java
View File

@ -102,7 +102,7 @@ public interface MsMapmoduleBMapper extends BaseMapper<MsMapmoduleB> {
+ "BMM.MULTI_SELECT AS multiSelect, BMM.CHECKED AS checked, BMM.CAN_BE_CHECKED AS canBeChecked, " + "BMM.MULTI_SELECT AS multiSelect, BMM.CHECKED AS checked, BMM.CAN_BE_CHECKED AS canBeChecked, "
+ "BMM.ORDER_INDEX AS pSort " + "BMM.ORDER_INDEX AS pSort "
+ "FROM MS_MAPLEGEND_B BML LEFT JOIN MS_MAPMODULE_B BMM ON BML.ID = BMM.RES_ID " + "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 "
+ "<choose>" + "<choose>"
+ "<when test=\"moduleId != null and moduleId != ''\"> AND BMM.MODULE_ID = #{moduleId}</when>" + "<when test=\"moduleId != null and moduleId != ''\"> AND BMM.MODULE_ID = #{moduleId}</when>"
+ "<otherwise> AND BMM.MODULE_ID = 'common'</otherwise>" + "<otherwise> AND BMM.MODULE_ID = 'common'</otherwise>"

6
backend/src/main/java/com/yfd/platform/qgc_sys/mapcfg/controller/MapmoduleBController.java
View File

@ -1,4 +1,5 @@
package com.yfd.platform.qgc_sys.mapcfg.controller; package com.yfd.platform.qgc_sys.mapcfg.controller;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -48,6 +49,7 @@ public class MapmoduleBController {
@Resource @Resource
private MsMaplayerBMapper msMaplayerBMapper; private MsMaplayerBMapper msMaplayerBMapper;
/** /**
* 条件过滤数据列表（Kendo UI 数据源） * 条件过滤数据列表（Kendo UI 数据源）
*/ */
@ -160,9 +162,9 @@ public class MapmoduleBController {
moduleWrapper.eq(MsMapmoduleB::getResType, "layer"); moduleWrapper.eq(MsMapmoduleB::getResType, "layer");
moduleWrapper.eq(MsMapmoduleB::getResId, layer.getId()); moduleWrapper.eq(MsMapmoduleB::getResId, layer.getId());
moduleWrapper.eq(MsMapmoduleB::getIsDeleted, 0); moduleWrapper.eq(MsMapmoduleB::getIsDeleted, 0);
MsMapmoduleB existingLayerModule = mapmoduleBService.getOne(moduleWrapper); long count = mapmoduleBService.count(moduleWrapper);
if (existingLayerModule == null) { if (count <= 0) {
MsMapmoduleB layerModule = new MsMapmoduleB(); MsMapmoduleB layerModule = new MsMapmoduleB();
layerModule.setModuleId(mapmoduleB.getModuleId()); layerModule.setModuleId(mapmoduleB.getModuleId());
layerModule.setSystemId(mapmoduleB.getSystemId()); layerModule.setSystemId(mapmoduleB.getSystemId());