diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GencodeTemplateObjController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GencodeTemplateObjController.java index db4ef448..c050eb05 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GencodeTemplateObjController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GencodeTemplateObjController.java @@ -32,7 +32,8 @@ public class GencodeTemplateObjController { private LambdaQueryWrapper getQueryWrapper(GencodeTemplateObj gencodeTemplateObj) { return new LambdaQueryWrapper() .eq(StrUtil.isNotBlank(gencodeTemplateObj.getGroupId()), GencodeTemplateObj::getGroupId, gencodeTemplateObj.getGroupId()) - .like(StrUtil.isNotBlank(gencodeTemplateObj.getName()), GencodeTemplateObj::getName, gencodeTemplateObj.getName()); + .like(StrUtil.isNotBlank(gencodeTemplateObj.getName()), GencodeTemplateObj::getName, gencodeTemplateObj.getName()) + .orderByAsc(GencodeTemplateObj::getSort); } @GetMapping("/list") diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/service/impl/GencodeTemplateGroupServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/service/impl/GencodeTemplateGroupServiceImpl.java index f2ebf57e..26da0796 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/service/impl/GencodeTemplateGroupServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/service/impl/GencodeTemplateGroupServiceImpl.java @@ -11,6 +11,8 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.List; + /** *

* 代码生成器模板 服务实现类 @@ -28,11 +30,12 @@ public class GencodeTemplateGroupServiceImpl extends ServiceImpl gencodeTemplateObjs = iGencodeTemplateObjService.list(Wrappers.lambdaUpdate().eq(GencodeTemplateObj::getGroupId, gencodeTemplateGroup.getId())); gencodeTemplateGroup.setId(null); gencodeTemplateGroup.setIsSystem("0"); gencodeTemplateGroup.setName(gencodeTemplateGroup.getName() + "--副本"); super.save(gencodeTemplateGroup); - for (GencodeTemplateObj gencodeTemplateObj : gencodeTemplateGroup.getGenCodeTemplateObjList()) { + for (GencodeTemplateObj gencodeTemplateObj : gencodeTemplateObjs) { gencodeTemplateObj.setId(null); gencodeTemplateObj.setGroupId(gencodeTemplateGroup.getId()); iGencodeTemplateObjService.save(gencodeTemplateObj);