代码生成器的buildQueryWrapper条件格式修改

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();
     }
 
-
     /**
      * 根据给定的列名和祖先值查找集合中是否存在匹配的记录
      *

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)
+    #if($table.crud)
-import org.dromara.common.core.domain.PageResult;
+    import org.dromara.common.core.domain.PageResult;
-import org.dromara.common.mybatis.core.page.PageQuery;
+    import org.dromara.common.mybatis.core.page.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+    import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-#end
+    #end
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -40,11 +40,11 @@ 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)
+    #if($table.crud)
         /**
          * 分页查询${functionName}列表
          *
@@ -58,7 +58,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
             Page<${ClassName}Vo> result = baseMapper.selectVoPage(pageQuery.build(), wrapper);
             return PageResult.build(result.getRecords(), result.getTotal());
         }
-#end
+    #end
 
     /**
      * 查询符合条件的${functionName}列表
@@ -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;

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());