diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/github/yulichang/wrapper/ext/Ext.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/github/yulichang/wrapper/ext/Ext.java
index 2b4e3af00..033c5c258 100644
--- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/github/yulichang/wrapper/ext/Ext.java
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/github/yulichang/wrapper/ext/Ext.java
@@ -4,7 +4,6 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.github.yulichang.wrapper.interfaces.IExt;
-import org.apache.commons.lang3.ArrayUtils;
 import org.dromara.common.mybatis.helper.DataBaseHelper;
 
 import java.util.Collection;
@@ -88,7 +87,6 @@ public interface Ext<Children extends MPJLambdaWrapper<?>> extends IExt<Children
         return getChildren();
     }
 
-
     /**
      * 根据给定的列名和祖先值查找集合中是否存在匹配的记录
      *
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
index 472fbcd33..c1c63fef6 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
@@ -2,11 +2,11 @@ package ${packageName}.service.impl;
 
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.dromara.common.core.utils.MapstructUtils;
-#if($table.crud)
-import org.dromara.common.core.domain.PageResult;
-import org.dromara.common.mybatis.core.page.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-#end
+    #if($table.crud)
+    import org.dromara.common.core.domain.PageResult;
+    import org.dromara.common.mybatis.core.page.PageQuery;
+    import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+    #end
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -40,25 +40,25 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
      * @return ${functionName}
      */
     @Override
-    public ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField}){
+    public ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField}) {
         return baseMapper.selectVoById(${pkColumn.javaField});
     }
 
-#if($table.crud)
-    /**
-     * 分页查询${functionName}列表
-     *
-     * @param bo        查询条件
-     * @param pageQuery 分页参数
-     * @return ${functionName}分页列表
-     */
-    @Override
-    public PageResult<${ClassName}Vo> queryPageList(${ClassName}Bo bo, PageQuery pageQuery) {
-        MPJLambdaWrapper<${ClassName}> wrapper = buildQueryWrapper(bo);
-        Page<${ClassName}Vo> result = baseMapper.selectVoPage(pageQuery.build(), wrapper);
-        return PageResult.build(result.getRecords(), result.getTotal());
-    }
-#end
+    #if($table.crud)
+        /**
+         * 分页查询${functionName}列表
+         *
+         * @param bo        查询条件
+         * @param pageQuery 分页参数
+         * @return ${functionName}分页列表
+         */
+        @Override
+        public PageResult<${ClassName}Vo> queryPageList(${ClassName}Bo bo, PageQuery pageQuery) {
+            MPJLambdaWrapper<${ClassName}> wrapper = buildQueryWrapper(bo);
+            Page<${ClassName}Vo> result = baseMapper.selectVoPage(pageQuery.build(), wrapper);
+            return PageResult.build(result.getRecords(), result.getTotal());
+        }
+    #end
 
     /**
      * 查询符合条件的${functionName}列表
@@ -78,31 +78,31 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
         #foreach($column in $columns)
             #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + $column.javaField.substring(1))
             #if($column.isPk==1)
-                wrapper.orderByAsc(${ClassName}::get$AttrName);
+        wrapper.orderByAsc(${ClassName}::get$AttrName);
             #end
             #if($column.query)
                 #set($queryType=$column.queryType.toLowerCase())
                 #set($javaField=$column.javaField)
                 #if($queryType == 'eq')
-                    wrapper.eqIfExists(${ClassName}::get$AttrName, bo.get$AttrName());
+        wrapper.eqIfExists(${ClassName}::get$AttrName, bo.get$AttrName());
                 #elseif($queryType == 'like')
-                    wrapper.likeIfExists(${ClassName}::get$AttrName, bo.get$AttrName());
+        wrapper.likeIfExists(${ClassName}::get$AttrName, bo.get$AttrName());
                 #elseif($queryType == 'likeleft')
-                    wrapper.likeLeftIfExists(${ClassName}::get$AttrName, bo.get$AttrName());
+        wrapper.likeLeftIfExists(${ClassName}::get$AttrName, bo.get$AttrName());
                 #elseif($queryType == 'likeright')
-                    wrapper.likeRightIfExists(${ClassName}::get$AttrName, bo.get$AttrName());
+        wrapper.likeRightIfExists(${ClassName}::get$AttrName, bo.get$AttrName());
                 #elseif($queryType == 'gt')
-                    wrapper.gtIfExists(${ClassName}::get$AttrName, bo.get$AttrName());
+        wrapper.gtIfExists(${ClassName}::get$AttrName, bo.get$AttrName());
                 #elseif($queryType == 'lt')
-                    wrapper.ltIfExists(${ClassName}::get$AttrName, bo.get$AttrName());
+        wrapper.ltIfExists(${ClassName}::get$AttrName, bo.get$AttrName());
                 #elseif($queryType == 'ge')
-                    wrapper.geIfExists(${ClassName}::get$AttrName, bo.get$AttrName());
+        wrapper.geIfExists(${ClassName}::get$AttrName, bo.get$AttrName());
                 #elseif($queryType == 'le')
-                    wrapper.leIfExists(${ClassName}::get$AttrName, bo.get$AttrName());
+        wrapper.leIfExists(${ClassName}::get$AttrName, bo.get$AttrName());
                 #elseif($queryType == 'in')
-                    wrapper.inIfExists(${ClassName}::get$AttrName, bo.get$AttrName());
+        wrapper.inIfExists(${ClassName}::get$AttrName, bo.get$AttrName());
                 #elseif($queryType == 'between')
-                    wrapper.betweenIfExists(${ClassName}::get$AttrName, params.get("begin$AttrName"), params.get("end$AttrName"));
+        wrapper.betweenIfExists(${ClassName}::get$AttrName, params.get("begin$AttrName"), params.get("end$AttrName"));
                 #end
             #end
         #end
@@ -117,10 +117,10 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
      */
     @Override
     public Boolean insertByBo(${ClassName}Bo bo) {
-        ${ClassName} add = MapstructUtils.convert(bo, ${ClassName}.class);
+        ${ClassName} add = MapstructUtils.convert(bo, ${ClassName}. class);
         validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
-#set($pk=$pkColumn.javaField.substring(0,1).toUpperCase() + ${pkColumn.javaField.substring(1)})
+        #set($pk=$pkColumn.javaField.substring(0,1).toUpperCase() + ${pkColumn.javaField.substring(1)})
         if (flag) {
             bo.set$pk(add.get$pk());
         }
@@ -135,7 +135,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
      */
     @Override
     public Boolean updateByBo(${ClassName}Bo bo) {
-        ${ClassName} update = MapstructUtils.convert(bo, ${ClassName}.class);
+        ${ClassName} update = MapstructUtils.convert(bo, ${ClassName}. class);
         validEntityBeforeSave(update);
         return baseMapper.updateById(update) > 0;
     }
@@ -143,7 +143,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(${ClassName} entity){
+    private void validEntityBeforeSave(${ClassName} entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
@@ -156,7 +156,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid) {
-        if(isValid){
+        if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
         return baseMapper.deleteByIds(ids) > 0;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java
index 37507d144..0cd89b21c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java
@@ -97,7 +97,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
      */
     private MPJLambdaWrapper<SysDept> buildQueryWrapper(SysDeptBo bo) {
         Map<String, Object> params = bo.getParams();
-        MPJLambdaWrapper<SysDept> wrapper = new MPJLambdaWrapper<SysDept>();
+        MPJLambdaWrapper<SysDept> wrapper = new MPJLambdaWrapper<>();
         wrapper.eqIfExists(SysDept::getDeptId, bo.getDeptId());
         wrapper.eqIfExists(SysDept::getParentId, bo.getParentId());
         wrapper.likeIfExists(SysDept::getDeptName, bo.getDeptName());