From edcfc61a6ad861d26957f853601715c8eddb5d1d Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Wed, 25 Dec 2024 13:46:48 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DefaultSystemConfigServiceHandler.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/DefaultSystemConfigServiceHandler.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/DefaultSystemConfigServiceHandler.java index b183328a6..54359bb2c 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/DefaultSystemConfigServiceHandler.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/DefaultSystemConfigServiceHandler.java @@ -1,7 +1,6 @@ package com.cf.imes.module.system.service.systemconfig.factory.service.impl; 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.organ.core.context.OrganContextHolder; import com.cf.imes.module.system.controller.admin.systemconfig.vo.ConfigDeleteReqVO; @@ -40,10 +39,10 @@ public class DefaultSystemConfigServiceHandler extends AbstractSystemConfigServi List systemConfigDOS = systemConfigMapper.selectList(new LambdaQueryWrapperX() .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()) .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)); // 遍历枚举 @@ -68,7 +67,7 @@ public class DefaultSystemConfigServiceHandler extends AbstractSystemConfigServi // 如果存在配置，保留版本号最大的配置 Optional maxVersionConfig = typeConfigs.stream() .map(m->m.setName(configTypeEnum.getName())) - .max(Comparator.comparing(SystemConfigDO::getVersion)); + .max(Comparator.comparingInt(SystemConfigDO::getVersion)); maxVersionConfig.ifPresent(resultList::add);