From 4e859d5a60690ca0ae1e5898e72217056dcb3ed7 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Thu, 29 Feb 2024 19:30:39 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E8=AE=BE=E7=BD=AE=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=BF=80=E6=B4=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../devtools/controller/GencodeTemplateObjController.java    | 3 ++-
 .../service/impl/GencodeTemplateGroupServiceImpl.java        | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

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<GencodeTemplateObj> getQueryWrapper(GencodeTemplateObj gencodeTemplateObj) {
         return new LambdaQueryWrapper<GencodeTemplateObj>()
                 .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;
+
 /**
  * <p>
  * 代码生成器模板 服务实现类
@@ -28,11 +30,12 @@ public class GencodeTemplateGroupServiceImpl extends ServiceImpl<GencodeTemplate
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void copy(GencodeTemplateGroup gencodeTemplateGroup) {
+        List<GencodeTemplateObj> gencodeTemplateObjs = iGencodeTemplateObjService.list(Wrappers.<GencodeTemplateObj>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);