diff --git a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/dict/service/impl/BizDictServiceImpl.java b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/dict/service/impl/BizDictServiceImpl.java index 329492db..c79956f8 100644 --- a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/dict/service/impl/BizDictServiceImpl.java +++ b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/dict/service/impl/BizDictServiceImpl.java @@ -63,8 +63,8 @@ public class BizDictServiceImpl extends ServiceImpl impl queryWrapper.lambda().select(BizDict::getId, BizDict::getParentId, BizDict::getCategory, BizDict::getDictLabel, BizDict::getDictValue, BizDict::getSortCode).eq(BizDict::getCategory, BizDictCategoryEnum.BIZ.getValue()); if (ObjectUtil.isNotEmpty(bizDictPageParam.getParentId())) { - queryWrapper.lambda().eq(BizDict::getParentId, bizDictPageParam.getParentId()) - .or().eq(BizDict::getId, bizDictPageParam.getParentId()); + queryWrapper.lambda().and(q -> q.eq(BizDict::getParentId, bizDictPageParam.getParentId()) + .or().eq(BizDict::getId, bizDictPageParam.getParentId())); } if (ObjectUtil.isNotEmpty(bizDictPageParam.getSearchKey())) { queryWrapper.lambda().like(BizDict::getDictLabel, bizDictPageParam.getSearchKey()); diff --git a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/service/impl/BizUserServiceImpl.java b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/service/impl/BizUserServiceImpl.java index 6e2901ec..90b801b5 100644 --- a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/service/impl/BizUserServiceImpl.java +++ b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/service/impl/BizUserServiceImpl.java @@ -121,8 +121,8 @@ public class BizUserServiceImpl extends ServiceImpl impl public Page page(BizUserPageParam bizUserPageParam) { QueryWrapper queryWrapper = new QueryWrapper<>(); if (ObjectUtil.isNotEmpty(bizUserPageParam.getSearchKey())) { - queryWrapper.lambda().like(BizUser::getAccount, bizUserPageParam.getSearchKey()).or() - .like(BizUser::getName, bizUserPageParam.getSearchKey()); + queryWrapper.lambda().and(q -> q.like(BizUser::getAccount, bizUserPageParam.getSearchKey()) + .or().like(BizUser::getName, bizUserPageParam.getSearchKey())); } if (ObjectUtil.isNotEmpty(bizUserPageParam.getOrgId())) { queryWrapper.lambda().eq(BizUser::getOrgId, bizUserPageParam.getOrgId()); @@ -413,9 +413,9 @@ public class BizUserServiceImpl extends ServiceImpl impl queryWrapper.lambda().in(BizUser::getId, StrUtil.split(bizUserExportParam.getUserIds(), StrUtil.COMMA)); } else { if (ObjectUtil.isNotEmpty(bizUserExportParam.getSearchKey())) { - queryWrapper.lambda().like(BizUser::getAccount, bizUserExportParam.getSearchKey()) + queryWrapper.lambda().and(q -> q.like(BizUser::getAccount, bizUserExportParam.getSearchKey()) .or().like(BizUser::getName, bizUserExportParam.getSearchKey()) - .or().like(BizUser::getPhone, bizUserExportParam.getSearchKey()); + .or().like(BizUser::getPhone, bizUserExportParam.getSearchKey())); } if (ObjectUtil.isNotEmpty(bizUserExportParam.getUserStatus())) { queryWrapper.lambda().eq(BizUser::getUserStatus, bizUserExportParam.getUserStatus()); diff --git a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/dict/service/impl/DevDictServiceImpl.java b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/dict/service/impl/DevDictServiceImpl.java index bca9f044..bff4acdb 100644 --- a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/dict/service/impl/DevDictServiceImpl.java +++ b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/dict/service/impl/DevDictServiceImpl.java @@ -63,8 +63,8 @@ public class DevDictServiceImpl extends ServiceImpl impl queryWrapper.lambda().select(DevDict::getId, DevDict::getParentId, DevDict::getCategory, DevDict::getDictLabel, DevDict::getDictValue, DevDict::getSortCode); if (ObjectUtil.isNotEmpty(devDictPageParam.getParentId())) { - queryWrapper.lambda().eq(DevDict::getParentId, devDictPageParam.getParentId()) - .or().eq(DevDict::getId, devDictPageParam.getParentId()); + queryWrapper.lambda().and(q -> q.eq(DevDict::getParentId, devDictPageParam.getParentId()) + .or().eq(DevDict::getId, devDictPageParam.getParentId())); } if (ObjectUtil.isNotEmpty(devDictPageParam.getCategory())) { queryWrapper.lambda().eq(DevDict::getCategory, devDictPageParam.getCategory()); diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java index 037f2d66..576b7816 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java @@ -216,8 +216,8 @@ public class SysUserServiceImpl extends ServiceImpl impl public Page page(SysUserPageParam sysUserPageParam) { QueryWrapper queryWrapper = new QueryWrapper<>(); if (ObjectUtil.isNotEmpty(sysUserPageParam.getSearchKey())) { - queryWrapper.lambda().like(SysUser::getAccount, sysUserPageParam.getSearchKey()).or() - .like(SysUser::getName, sysUserPageParam.getSearchKey()); + queryWrapper.lambda().and(q -> q.like(SysUser::getAccount, sysUserPageParam.getSearchKey()).or() + .like(SysUser::getName, sysUserPageParam.getSearchKey())); } if (ObjectUtil.isNotEmpty(sysUserPageParam.getOrgId())) { queryWrapper.lambda().eq(SysUser::getOrgId, sysUserPageParam.getOrgId()); @@ -1176,9 +1176,9 @@ public class SysUserServiceImpl extends ServiceImpl impl queryWrapper.lambda().in(SysUser::getId, StrUtil.split(sysUserExportParam.getUserIds(), StrUtil.COMMA)); } else { if (ObjectUtil.isNotEmpty(sysUserExportParam.getSearchKey())) { - queryWrapper.lambda().like(SysUser::getAccount, sysUserExportParam.getSearchKey()) + queryWrapper.lambda().and(q -> q.like(SysUser::getAccount, sysUserExportParam.getSearchKey()) .or().like(SysUser::getName, sysUserExportParam.getSearchKey()) - .or().like(SysUser::getPhone, sysUserExportParam.getSearchKey()); + .or().like(SysUser::getPhone, sysUserExportParam.getSearchKey())); } if (ObjectUtil.isNotEmpty(sysUserExportParam.getUserStatus())) { queryWrapper.lambda().eq(SysUser::getUserStatus, sysUserExportParam.getUserStatus());