Browse Source

修改bug

master
刘忱 2 years ago
parent
commit
c6a708cbd3
  1. 6
      win-framework/win-common/src/main/java/com/win/framework/common/package-info.java
  2. 4
      win-framework/win-common/src/main/java/com/win/framework/common/pojo/PageParam.java
  3. 7
      win-framework/win-common/src/main/java/com/win/framework/common/util/package-info.java
  4. 7
      win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/mybatis/core/mapper/BaseMapperX.java
  5. 9
      win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/mybatis/core/util/QueryWrapperUtils.java

6
win-framework/win-common/src/main/java/com/win/framework/common/package-info.java

@ -1,6 +0,0 @@
/**
* 基础的通用类和框架无关
*
* 例如说CommonResult 为通用返回
*/
package com.win.framework.common;

4
win-framework/win-common/src/main/java/com/win/framework/common/pojo/PageParam.java

@ -41,13 +41,13 @@ public class PageParam implements Serializable {
* 字段
*/
@Schema(description = "排序属性", requiredMode = Schema.RequiredMode.REQUIRED, example = "userName")
private String sort = "create_time";
private String sort;
/**
* 顺序
*/
@Schema(description = "排序类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "DESC")
private String by = "DESC";
private String by;
public void setSort(String sort) {
if(sort != null) {

7
win-framework/win-common/src/main/java/com/win/framework/common/util/package-info.java

@ -1,7 +0,0 @@
/**
* 对于工具类的选择优先查找 Hutool 中有没对应的方法
* 如果没有则自己封装对应的工具类 Utils 结尾用于区分
*
* ps如果担心 Hutool 存在坑的问题可以阅读 Hutool 的实现源码以确保可靠性并且可以补充相关的单元测试
*/
package com.win.framework.common.util;

7
win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/mybatis/core/mapper/BaseMapperX.java

@ -1,16 +1,17 @@
package com.win.framework.mybatis.core.mapper;
import cn.hutool.core.collection.CollUtil;
import com.win.framework.common.pojo.PageParam;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.mybatis.core.util.MyBatisUtils;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
import com.baomidou.mybatisplus.extension.toolkit.Db;
import com.github.yulichang.base.MPJBaseMapper;
import com.win.framework.common.pojo.PageParam;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.mybatis.core.util.MyBatisUtils;
import org.apache.ibatis.annotations.Param;
import java.util.Collection;

9
win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/mybatis/core/util/QueryWrapperUtils.java

@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.common.base.CaseFormat;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.util.collection.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
/**
* QueryWrapper工具类
@ -19,14 +18,6 @@ public class QueryWrapperUtils {
*/
public static <T> QueryWrapper<T> structure(CustomConditions customConditions) {
QueryWrapper<T> queryWrapper = new QueryWrapper<>();
String sorting = customConditions.getSort();
if(StringUtils.isEmpty(sorting)) {
if(CustomConditions.ORDER_DESC.equals(customConditions.getBy())) {
queryWrapper.orderByDesc(sorting);
} else {
queryWrapper.orderByAsc(sorting);
}
}
if(CollectionUtils.isAnyEmpty(customConditions.getFilters())) {
return queryWrapper;
}

Loading…
Cancel
Save