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-23 08:20:31 +08:00
parent 939a98acfa
commit c8eb64379c
6 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/src/main/java/com/yfd/platform/qgc_env/overview/service/impl/OverviewServiceImpl.java
View File

@ -1617,6 +1617,7 @@ public class OverviewServiceImpl implements OverviewService {
case "topHynm" -> "t.TOP_HYNM"; case "topHynm" -> "t.TOP_HYNM";
case "lgtd" -> "t.LGTD"; case "lgtd" -> "t.LGTD";
case "lttd" -> "t.LTTD"; case "lttd" -> "t.LTTD";
case "url" -> "t.URL";
case "stlc" -> "t.STLC"; case "stlc" -> "t.STLC";
case "usfl" -> "t.USFL"; case "usfl" -> "t.USFL";
case "dtin" -> "t.DTIN"; case "dtin" -> "t.DTIN";

4
backend/src/main/java/com/yfd/platform/qgc_sys/cuscolumn/service/impl/MsUsercolumnBServiceImpl.java
View File

@ -29,7 +29,7 @@ public class MsUsercolumnBServiceImpl
throw new IllegalArgumentException("模块(cfgId)不能为空"); throw new IllegalArgumentException("模块(cfgId)不能为空");
} }
String currentUser = SecurityUtils.getCurrentUsername(); String currentUser = SecurityUtils.getUserId();
List<MsUsercolumnB> list = userColumn.getList(); List<MsUsercolumnB> list = userColumn.getList();
if (list != null && !list.isEmpty()) { if (list != null && !list.isEmpty()) {
@ -53,7 +53,7 @@ public class MsUsercolumnBServiceImpl
@Override @Override
public List<MsUsercolumnB> getUserColumnData(MsUsercolumnB userColumn) { public List<MsUsercolumnB> getUserColumnData(MsUsercolumnB userColumn) {
String currentUser = SecurityUtils.getCurrentUsername(); String currentUser = SecurityUtils.getUserId();
return usercolumnBMapper.getUserColumnList(currentUser, userColumn.getCfgId()); return usercolumnBMapper.getUserColumnList(currentUser, userColumn.getCfgId());
} }
} }

4
backend/src/main/java/com/yfd/platform/system/controller/SysDictionaryController.java
View File

@ -43,12 +43,12 @@ public class SysDictionaryController {
***********************************/ ***********************************/
@GetMapping("/dictList") @GetMapping("/dictList")
@Operation(summary = "获取数据字典列表") @Operation(summary = "获取数据字典列表")
public ResponseResult getDictList(String dictType) { public ResponseResult getDictList(String dictType,String dictName) {
if (StrUtil.isBlank(dictType)) { if (StrUtil.isBlank(dictType)) {
return ResponseResult.error("参数为空"); return ResponseResult.error("参数为空");
} }
List<SysDictionary> sysDictionaries = List<SysDictionary> sysDictionaries =
sysDictionaryService.getDictList(dictType); sysDictionaryService.getDictList(dictType,dictName);
return ResponseResult.successData(sysDictionaries); return ResponseResult.successData(sysDictionaries);
} }

2
backend/src/main/java/com/yfd/platform/system/service/ISysDictionaryService.java
View File

@ -20,7 +20,7 @@ public interface ISysDictionaryService extends IService<SysDictionary> {
* 参数说明 dictType 字典类型 * 参数说明 dictType 字典类型
* 返回值说明: com.yfd.platform.config.ResponseResult 返回分页查询结果 * 返回值说明: com.yfd.platform.config.ResponseResult 返回分页查询结果
***********************************/ ***********************************/
List<SysDictionary> getDictList(String dictType); List<SysDictionary> getDictList(String dictType,String dictName);
/********************************** /**********************************
* 用途说明: 新增字典 * 用途说明: 新增字典

5
backend/src/main/java/com/yfd/platform/system/service/impl/SysDictionaryServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.yfd.platform.system.service.impl; 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.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@ -39,10 +40,10 @@ public class SysDictionaryServiceImpl extends ServiceImpl<SysDictionaryMapper
* 返回值说明: 返回字典列表集合 * 返回值说明: 返回字典列表集合
***********************************/ ***********************************/
@Override @Override
public List<SysDictionary> getDictList(String dictType) { public List<SysDictionary> getDictList(String dictType,String dictName) {
LambdaQueryWrapper<SysDictionary> queryWrapper = LambdaQueryWrapper<SysDictionary> queryWrapper =
new LambdaQueryWrapper<>(); 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); return sysDictionaryMapper.selectList(queryWrapper);
} }

3
backend/src/main/resources/mapper/system/MsUsercolumnBMapper.xml
View File

@ -35,7 +35,8 @@
mcb.COLUMN_EN, mcb.COLUMN_EN,
mcb.COLUMN_CFG AS COLUMN_NAME, mcb.COLUMN_CFG AS COLUMN_NAME,
CASE WHEN mub.COLUMN_EN IS NULL THEN 1 ELSE 0 END AS DEFAULT_CONFIG, 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, CASE WHEN mub.ORDER_INDEX IS NULL THEN mcb.ORDER_INDEX ELSE mub.ORDER_INDEX END AS ORDER_INDEX,
mub.RECORD_USER, mub.RECORD_USER,
CASE WHEN mub.CHECKED IS NULL THEN mcb.DEFAULT_CHECKED ELSE mub.CHECKED END AS CHECKED, CASE WHEN mub.CHECKED IS NULL THEN mcb.DEFAULT_CHECKED ELSE mub.CHECKED END AS CHECKED,