diff --git a/src/main/java/com/cczsa/xinghe/codegen/service/impl/FunOperationServiceImpl.java b/src/main/java/com/cczsa/xinghe/codegen/service/impl/FunOperationServiceImpl.java index aa8e953..c3cf968 100644 --- a/src/main/java/com/cczsa/xinghe/codegen/service/impl/FunOperationServiceImpl.java +++ b/src/main/java/com/cczsa/xinghe/codegen/service/impl/FunOperationServiceImpl.java @@ -3,6 +3,7 @@ package com.cczsa.xinghe.codegen.service.impl; import com.cczsa.xinghe.codegen.entity.FunItemEntity; import com.cczsa.xinghe.codegen.entity.FunModuleEntity; import com.cczsa.xinghe.codegen.entity.FunOperationEntity; +import com.cczsa.xinghe.codegen.entity.enums.UsableConfigEnum; import com.cczsa.xinghe.codegen.entity.req.funOperation.FunOperationDeleteReq; import com.cczsa.xinghe.codegen.entity.req.funOperation.FunOperationQueryReq; import com.cczsa.xinghe.codegen.entity.req.funOperation.FunOperationSaveUpdateReq; @@ -17,6 +18,7 @@ import com.cczsa.xinghe.codegen.service.FunOperationService; import com.cczsa.xinghe.codegen.util.XResult; import com.github.xiaoymin.knife4j.core.util.StrUtil; import com.mybatisflex.core.query.QueryWrapper; +import com.mybatisflex.core.util.CollectionUtil; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -112,6 +114,13 @@ public class FunOperationServiceImpl implements FunOperationService { if (funOperationMapper.selectCountByQuery(queryOperationCode) > 0) { return XResult.failed("同模块同功能中操作编码已存在"); } + // usableConfig 排序 + List usableConfig = req.getUsableConfig(); + if (CollectionUtil.isNotEmpty(usableConfig)) { + // 按照枚举的code值升序排序 + usableConfig.sort((a, b) -> Integer.compare(a.getCode(), b.getCode())); + req.setUsableConfig(usableConfig); + } FunOperationEntity funOperationEntity = new FunOperationEntity(); BeanUtils.copyProperties(req, funOperationEntity); funOperationEntity.setId(id);