diff --git a/src/main/java/com/cczsa/xinghe/codegen/entity/req/funModule/FunModuleSaveUpdateReq.java b/src/main/java/com/cczsa/xinghe/codegen/entity/req/funModule/FunModuleSaveUpdateReq.java index 1c153b5..7e5f593 100644 --- a/src/main/java/com/cczsa/xinghe/codegen/entity/req/funModule/FunModuleSaveUpdateReq.java +++ b/src/main/java/com/cczsa/xinghe/codegen/entity/req/funModule/FunModuleSaveUpdateReq.java @@ -42,10 +42,12 @@ public class FunModuleSaveUpdateReq implements Serializable { @Schema(description = "描述") private String describe; + @Pattern(regexp = "^[a-z]+(\\.[a-z]+)*$", message = "参数包名只能包含小写英文字母和点(.),如com.cczsa.xinghe.codegen") @NotBlank(message = "包名称不能为空") @Schema(description = "包名称") private String packageName; + @Pattern(regexp = "^[a-z]+(\\.[a-z]+)*$", message = "参数包名只能包含小写英文字母和点(.),如com.cczsa.xinghe.codegen") @NotBlank(message = "参数包名不能为空") @Schema(description = "参数包名") private String apiPackageName; diff --git a/src/main/java/com/cczsa/xinghe/codegen/service/impl/FunItemServiceImpl.java b/src/main/java/com/cczsa/xinghe/codegen/service/impl/FunItemServiceImpl.java index aebc932..94eb188 100644 --- a/src/main/java/com/cczsa/xinghe/codegen/service/impl/FunItemServiceImpl.java +++ b/src/main/java/com/cczsa/xinghe/codegen/service/impl/FunItemServiceImpl.java @@ -49,7 +49,7 @@ public class FunItemServiceImpl implements FunItemService { .eq(FunItemEntity::getModuleId, req.getModuleId()) .like(FunItemEntity::getItemName, req.getItemName(), StrUtil.isNotBlank(req.getItemName())) .like(FunItemEntity::getItemCode, req.getItemCode(), StrUtil.isNotBlank(req.getItemCode())) - .orderBy(FunItemEntity::getSortOrder, true); + .orderBy(FunItemEntity::getSortOrder, false); List funItemQueryRes = funItemMapper.selectListByQueryAs(queryWrapper, FunItemQueryRes.class); return XResult.ok(funItemQueryRes); } diff --git a/src/main/java/com/cczsa/xinghe/codegen/service/impl/FunModuleServiceImpl.java b/src/main/java/com/cczsa/xinghe/codegen/service/impl/FunModuleServiceImpl.java index 6f942d5..0e420a5 100644 --- a/src/main/java/com/cczsa/xinghe/codegen/service/impl/FunModuleServiceImpl.java +++ b/src/main/java/com/cczsa/xinghe/codegen/service/impl/FunModuleServiceImpl.java @@ -54,7 +54,7 @@ public class FunModuleServiceImpl implements FunModuleService { .from(funModuleDef) .like(FunModuleEntity::getModuleName, req.getModuleName(), StrUtil.isNotBlank(req.getModuleName())) .like(FunModuleEntity::getModuleCode, req.getModuleCode(), StrUtil.isNotBlank(req.getModuleCode())) - .orderBy(FunModuleEntity::getSortOrder, true); + .orderBy(FunModuleEntity::getSortOrder, false); List funModuleQueryRes = funModuleMapper.selectListByQueryAs(queryWrapper, FunModuleQueryRes.class); return XResult.ok(funModuleQueryRes); } 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 703717f..466dea6 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 @@ -48,7 +48,7 @@ public class FunOperationServiceImpl implements FunOperationService { .eq(FunOperationEntity::getItemId, req.getItemId()) .like(FunOperationEntity::getOperationCode, req.getOperationCode(), StrUtil.isNotBlank(req.getOperationCode())) .like(FunOperationEntity::getFunName, req.getFunName(), StrUtil.isNotBlank(req.getFunName())) - .orderBy(FunOperationEntity::getSortOrder, true); + .orderBy(FunOperationEntity::getSortOrder, false); List funOperationQueryRes = funOperationMapper.selectListByQueryAs(queryWrapper, FunOperationQueryRes.class); return XResult.ok(funOperationQueryRes); }