From c8eb64379c8d7602238ca06aae3a83f4722d4da9 Mon Sep 17 00:00:00 2001 From: tangwei Date: Thu, 23 Jul 2026 08:20:31 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qgc_env/overview/service/impl/OverviewServiceImpl.java | 1 + .../cuscolumn/service/impl/MsUsercolumnBServiceImpl.java | 4 ++-- .../platform/system/controller/SysDictionaryController.java | 4 ++-- .../yfd/platform/system/service/ISysDictionaryService.java | 2 +- .../system/service/impl/SysDictionaryServiceImpl.java | 5 +++-- .../src/main/resources/mapper/system/MsUsercolumnBMapper.xml | 3 ++- 6 files changed, 11 insertions(+), 8 deletions(-) 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 a84ca5a7..654b1640 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 @@ -1617,6 +1617,7 @@ public class OverviewServiceImpl implements OverviewService { case "topHynm" -> "t.TOP_HYNM"; case "lgtd" -> "t.LGTD"; case "lttd" -> "t.LTTD"; + case "url" -> "t.URL"; case "stlc" -> "t.STLC"; case "usfl" -> "t.USFL"; case "dtin" -> "t.DTIN"; diff --git a/backend/src/main/java/com/yfd/platform/qgc_sys/cuscolumn/service/impl/MsUsercolumnBServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_sys/cuscolumn/service/impl/MsUsercolumnBServiceImpl.java index 1524c95c..9c547343 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_sys/cuscolumn/service/impl/MsUsercolumnBServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_sys/cuscolumn/service/impl/MsUsercolumnBServiceImpl.java @@ -29,7 +29,7 @@ public class MsUsercolumnBServiceImpl throw new IllegalArgumentException("模块(cfgId)不能为空"); } - String currentUser = SecurityUtils.getCurrentUsername(); + String currentUser = SecurityUtils.getUserId(); List list = userColumn.getList(); if (list != null && !list.isEmpty()) { @@ -53,7 +53,7 @@ public class MsUsercolumnBServiceImpl @Override public List getUserColumnData(MsUsercolumnB userColumn) { - String currentUser = SecurityUtils.getCurrentUsername(); + String currentUser = SecurityUtils.getUserId(); return usercolumnBMapper.getUserColumnList(currentUser, userColumn.getCfgId()); } } diff --git a/backend/src/main/java/com/yfd/platform/system/controller/SysDictionaryController.java b/backend/src/main/java/com/yfd/platform/system/controller/SysDictionaryController.java index b3db106e..b91f785c 100644 --- a/backend/src/main/java/com/yfd/platform/system/controller/SysDictionaryController.java +++ b/backend/src/main/java/com/yfd/platform/system/controller/SysDictionaryController.java @@ -43,12 +43,12 @@ public class SysDictionaryController { ***********************************/ @GetMapping("/dictList") @Operation(summary = "获取数据字典列表") - public ResponseResult getDictList(String dictType) { + public ResponseResult getDictList(String dictType,String dictName) { if (StrUtil.isBlank(dictType)) { return ResponseResult.error("参数为空"); } List sysDictionaries = - sysDictionaryService.getDictList(dictType); + sysDictionaryService.getDictList(dictType,dictName); return ResponseResult.successData(sysDictionaries); } diff --git a/backend/src/main/java/com/yfd/platform/system/service/ISysDictionaryService.java b/backend/src/main/java/com/yfd/platform/system/service/ISysDictionaryService.java index 724e240e..fdcb9a14 100644 --- a/backend/src/main/java/com/yfd/platform/system/service/ISysDictionaryService.java +++ b/backend/src/main/java/com/yfd/platform/system/service/ISysDictionaryService.java @@ -20,7 +20,7 @@ public interface ISysDictionaryService extends IService { * 参数说明 dictType 字典类型 * 返回值说明: com.yfd.platform.config.ResponseResult 返回分页查询结果 ***********************************/ - List getDictList(String dictType); + List getDictList(String dictType,String dictName); /********************************** * 用途说明: 新增字典 diff --git a/backend/src/main/java/com/yfd/platform/system/service/impl/SysDictionaryServiceImpl.java b/backend/src/main/java/com/yfd/platform/system/service/impl/SysDictionaryServiceImpl.java index f3e81308..19bed6c3 100644 --- a/backend/src/main/java/com/yfd/platform/system/service/impl/SysDictionaryServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/system/service/impl/SysDictionaryServiceImpl.java @@ -1,5 +1,6 @@ package com.yfd.platform.system.service.impl; +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; @@ -39,10 +40,10 @@ public class SysDictionaryServiceImpl extends ServiceImpl getDictList(String dictType) { + public List getDictList(String dictType,String dictName) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SysDictionary::getDictType, dictType).orderByAsc(SysDictionary::getOrderNo); + queryWrapper.eq(SysDictionary::getDictType, dictType).eq(StrUtil.isNotBlank(dictName),SysDictionary::getDictName, dictName).orderByAsc(SysDictionary::getOrderNo); return sysDictionaryMapper.selectList(queryWrapper); } diff --git a/backend/src/main/resources/mapper/system/MsUsercolumnBMapper.xml b/backend/src/main/resources/mapper/system/MsUsercolumnBMapper.xml index 14819390..ca72d700 100644 --- a/backend/src/main/resources/mapper/system/MsUsercolumnBMapper.xml +++ b/backend/src/main/resources/mapper/system/MsUsercolumnBMapper.xml @@ -35,7 +35,8 @@ mcb.COLUMN_EN, mcb.COLUMN_CFG AS COLUMN_NAME, CASE WHEN mub.COLUMN_EN IS NULL THEN 1 ELSE 0 END AS DEFAULT_CONFIG, - CASE WHEN mub.ENABLE IS NULL THEN mcb.ENABLE ELSE mub.ENABLE END AS ENABLE, +-- CASE WHEN mub.ENABLE IS NULL THEN mcb.ENABLE ELSE mub.ENABLE END AS ENABLE, + CASE WHEN mcb.ENABLE IS NULL THEN mub.ENABLE ELSE mcb.ENABLE END AS ENABLE, CASE WHEN mub.ORDER_INDEX IS NULL THEN mcb.ORDER_INDEX ELSE mub.ORDER_INDEX END AS ORDER_INDEX, mub.RECORD_USER, CASE WHEN mub.CHECKED IS NULL THEN mcb.DEFAULT_CHECKED ELSE mub.CHECKED END AS CHECKED,