|
@@ -246,11 +246,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
}
|
|
}
|
|
QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
|
|
if (type==null||type=="") {
|
|
if (type==null||type=="") {
|
|
- queryWrapper.ge("create_time", date)
|
|
|
|
|
|
+ queryWrapper.ge(StringUtils.isNotBlank(date),"create_time", date)
|
|
.in("user_type", 0,1,4);
|
|
.in("user_type", 0,1,4);
|
|
- queryWrapper.like("user_name", word)
|
|
|
|
- .like("phone", word)
|
|
|
|
- .like("id_card", word);
|
|
|
|
|
|
+ queryWrapper.like(StringUtils.isNotBlank(word),"user_name", word)
|
|
|
|
+ .like(StringUtils.isNotBlank(word),"phone", word)
|
|
|
|
+ .like(StringUtils.isNotBlank(word),"id_card", word);
|
|
queryWrapper.orderByDesc("create_time");
|
|
queryWrapper.orderByDesc("create_time");
|
|
} else if (Integer.parseInt(type)==1) { //待审核
|
|
} else if (Integer.parseInt(type)==1) { //待审核
|
|
queryWrapper.eq("accout_type", 0)
|
|
queryWrapper.eq("accout_type", 0)
|