From b5c2401328914a33fd769753cb4130f642fad02d Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Thu, 23 Dec 2021 17:25:52 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.1.6=E3=80=91=E6=95=B4=E7=90=86?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/controller/SysThemeController.java       |  2 +-
 .../theme/service/impl/SysThemeServiceImpl.java    |  4 ++--
 .../service/impl/SysThemeTemplateServiceImpl.java  | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/controller/SysThemeController.java b/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/controller/SysThemeController.java
index 92d296a21..9e2b3f37e 100644
--- a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/controller/SysThemeController.java
+++ b/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/controller/SysThemeController.java
@@ -69,7 +69,7 @@ public class SysThemeController {
      * @date 2021/12/17 16:58
      */
     @GetResource(name = "查询系统主题", path = "/sysTheme/findPage")
-    public ResponseData findPage(SysThemeRequest sysThemeParam)  {
+    public ResponseData findPage(SysThemeRequest sysThemeParam) {
         return new SuccessResponseData(sysThemeService.findPage(sysThemeParam));
     }
 
diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeServiceImpl.java b/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeServiceImpl.java
index 876864921..b3a9823ea 100644
--- a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeServiceImpl.java
+++ b/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeServiceImpl.java
@@ -90,7 +90,7 @@ public class SysThemeServiceImpl extends ServiceImpl<SysThemeMapper, SysTheme> i
         // 获取图片文件的编码
         LambdaQueryWrapper<SysThemeTemplateField> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.in(SysThemeTemplateField::getFieldName, themeKeys).eq(SysThemeTemplateField::getFieldType, "file")
-                    .select(SysThemeTemplateField::getFieldName);
+                .select(SysThemeTemplateField::getFieldName);
         List<SysThemeTemplateField> sysThemeTemplateFields = sysThemeTemplateFieldService.list(queryWrapper);
         List<String> fileNames = sysThemeTemplateFields.stream().map(SysThemeTemplateField::getFieldName).collect(Collectors.toList());
 
@@ -125,7 +125,7 @@ public class SysThemeServiceImpl extends ServiceImpl<SysThemeMapper, SysTheme> i
     public PageResult<SysTheme> findPage(SysThemeRequest sysThemeRequest) {
         LambdaQueryWrapper<SysTheme> queryWrapper = new LambdaQueryWrapper<>();
         // 通过主题名称模糊查询
-        queryWrapper.like(StrUtil.isNotBlank(sysThemeRequest.getThemeName()),SysTheme::getThemeName, sysThemeRequest.getThemeName());
+        queryWrapper.like(StrUtil.isNotBlank(sysThemeRequest.getThemeName()), SysTheme::getThemeName, sysThemeRequest.getThemeName());
 
         Page<SysTheme> page = page(PageFactory.defaultPage(), queryWrapper);
 
diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeTemplateServiceImpl.java b/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeTemplateServiceImpl.java
index e962d5f58..e3845df6c 100644
--- a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeTemplateServiceImpl.java
+++ b/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeTemplateServiceImpl.java
@@ -116,7 +116,7 @@ public class SysThemeTemplateServiceImpl extends ServiceImpl<SysThemeTemplateMap
     public PageResult<SysThemeTemplate> findPage(SysThemeTemplateRequest sysThemeTemplateRequest) {
         LambdaQueryWrapper<SysThemeTemplate> queryWrapper = new LambdaQueryWrapper<>();
         // 根据系统主题模板名称模糊查询
-        queryWrapper.like(StrUtil.isNotBlank(sysThemeTemplateRequest.getTemplateName()) ,SysThemeTemplate::getTemplateName, sysThemeTemplateRequest.getTemplateName());
+        queryWrapper.like(StrUtil.isNotBlank(sysThemeTemplateRequest.getTemplateName()), SysThemeTemplate::getTemplateName, sysThemeTemplateRequest.getTemplateName());
 
         Page<SysThemeTemplate> page = page(PageFactory.defaultPage(), queryWrapper);
 
@@ -145,6 +145,12 @@ public class SysThemeTemplateServiceImpl extends ServiceImpl<SysThemeTemplateMap
         this.updateById(sysThemeTemplate);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public List<SysThemeTemplateDataDTO> detail(SysThemeTemplateRequest sysThemeTemplateRequest) {
+        return sysThemeTemplateMapper.sysThemeTemplateDetail(sysThemeTemplateRequest.getTemplateId());
+    }
+
     /**
      * 查询单个系统主题模板
      *
@@ -158,10 +164,4 @@ public class SysThemeTemplateServiceImpl extends ServiceImpl<SysThemeTemplateMap
         }
         return sysThemeTemplate;
     }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public List<SysThemeTemplateDataDTO> detail(SysThemeTemplateRequest sysThemeTemplateRequest) {
-       return sysThemeTemplateMapper.sysThemeTemplateDetail(sysThemeTemplateRequest.getTemplateId());
-    }
 }