Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 05:42:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

系统配置默认分页查询修改

Browse Source
This commit is contained in:
liuzhaotian
2024-12-25 13:46:48 +08:00
parent cf8fc97ea4
commit edcfc61a6a
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/DefaultSystemConfigServiceHandler.java
+3 -4
View File
@@ -1,7 +1,6 @@
package com.cf.imes.module.system.service.systemconfig.factory.service.impl; package com.cf.imes.module.system.service.systemconfig.factory.service.impl;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.cf.imes.framework.common.enums.CommonStatusEnum;
import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.cf.imes.framework.organ.core.context.OrganContextHolder; import com.cf.imes.framework.organ.core.context.OrganContextHolder;
import com.cf.imes.module.system.controller.admin.systemconfig.vo.ConfigDeleteReqVO; import com.cf.imes.module.system.controller.admin.systemconfig.vo.ConfigDeleteReqVO;
@@ -40,10 +39,10 @@ public class DefaultSystemConfigServiceHandler extends AbstractSystemConfigServi
List<SystemConfigDO> systemConfigDOS = systemConfigMapper.selectList(new LambdaQueryWrapperX<SystemConfigDO>() List<SystemConfigDO> systemConfigDOS = systemConfigMapper.selectList(new LambdaQueryWrapperX<SystemConfigDO>()
.likeIfPresent(SystemConfigDO::getName, reqVO.getName()) .likeIfPresent(SystemConfigDO::getName, reqVO.getName())
.eq(SystemConfigDO::getStatus, CommonStatusEnum.ENABLE.getStatus()) // .eq(SystemConfigDO::getStatus, CommonStatusEnum.ENABLE.getStatus())
.in(SystemConfigDO::getType, list.stream().map(SystemConfigTypeEnum::getType).toList()) .in(SystemConfigDO::getType, list.stream().map(SystemConfigTypeEnum::getType).toList())
.eqIfPresent(SystemConfigDO::getOrganId, OrganContextHolder.getOrganId()) .eqIfPresent(SystemConfigDO::getOrganId, OrganContextHolder.getOrganId())
.select(SystemConfigDO::getId, SystemConfigDO::getName, SystemConfigDO::getStatus, SystemConfigDO::getType) .select(SystemConfigDO::getId, SystemConfigDO::getName, SystemConfigDO::getStatus, SystemConfigDO::getType,SystemConfigDO::getVersion)
.orderByAsc(SystemConfigDO::getId)); .orderByAsc(SystemConfigDO::getId));
// 遍历枚举 // 遍历枚举
@@ -68,7 +67,7 @@ public class DefaultSystemConfigServiceHandler extends AbstractSystemConfigServi
// 如果存在配置，保留版本号最大的配置 // 如果存在配置，保留版本号最大的配置
Optional<SystemConfigDO> maxVersionConfig = typeConfigs.stream() Optional<SystemConfigDO> maxVersionConfig = typeConfigs.stream()
.map(m->m.setName(configTypeEnum.getName())) .map(m->m.setName(configTypeEnum.getName()))
.max(Comparator.comparing(SystemConfigDO::getVersion)); .max(Comparator.comparingInt(SystemConfigDO::getVersion));
maxVersionConfig.ifPresent(resultList::add); maxVersionConfig.ifPresent(resultList::add);