diff --git a/src/main/java/com/peanut/modules/master/controller/UserVipController.java b/src/main/java/com/peanut/modules/master/controller/UserVipController.java index f1d8e2f2..902ea769 100644 --- a/src/main/java/com/peanut/modules/master/controller/UserVipController.java +++ b/src/main/java/com/peanut/modules/master/controller/UserVipController.java @@ -113,13 +113,13 @@ public class UserVipController { wrapper.selectAll(UserVip.class); wrapper.leftJoin(MyUserEntity.class, MyUserEntity::getId, UserVip::getUserId); if (params.containsKey("userName")&& StringUtils.isNotEmpty(params.get("userName").toString())) { - wrapper.eq(MyUserEntity::getName,params.get("userName")); + wrapper.like(MyUserEntity::getName,params.get("userName")); } if (params.containsKey("tel")&& StringUtils.isNotEmpty(params.get("tel").toString())) { - wrapper.eq(MyUserEntity::getTel,params.get("tel")); + wrapper.like(MyUserEntity::getTel,params.get("tel")); } if (params.containsKey("email")&& StringUtils.isNotEmpty(params.get("email").toString())) { - wrapper.eq(MyUserEntity::getEmail,params.get("email")); + wrapper.like(MyUserEntity::getEmail,params.get("email")); } if (params.containsKey("type")&& StringUtils.isNotEmpty(params.get("type").toString())) { wrapper.eq(UserVip::getType,params.get("type")); @@ -127,6 +127,7 @@ public class UserVipController { if (params.containsKey("state")&& StringUtils.isNotEmpty(params.get("state").toString())) { wrapper.eq(UserVip::getState,params.get("state")); } + wrapper.orderByAsc(UserVip::getState); wrapper.orderByAsc(UserVip::getEndTime); Page page = vipService.page(new Page<>( Long.parseLong(params.get("current").toString()), Long.parseLong(params.get("limit").toString())), wrapper);