gitee
/
snowy
mirror of https://gitee.com/xiaonuobase/snowy
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: 修正[mybatis-plus的or方法使用不当，导致生成的sql的where条件不符合预期--应该包在括号里的or语句，漏掉了括号]

pull/156/head
gosk 2023-08-21 12:12:13 +09:00 committed by 小诺
parent 85c603e218
commit 3f493de7bf
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/dict/service/impl/BizDictServiceImpl.java
View File

@ -63,8 +63,8 @@ public class BizDictServiceImpl extends ServiceImpl<BizDictMapper, BizDict> 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());

8
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/service/impl/BizUserServiceImpl.java
View File

@ -121,8 +121,8 @@ public class BizUserServiceImpl extends ServiceImpl<BizUserMapper, BizUser> impl
public Page<BizUser> page(BizUserPageParam bizUserPageParam) {
QueryWrapper<BizUser> 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<BizUserMapper, BizUser> 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());

4
snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/dict/service/impl/DevDictServiceImpl.java
View File

@ -63,8 +63,8 @@ public class DevDictServiceImpl extends ServiceImpl<DevDictMapper, DevDict> 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());

8
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java
View File

@ -216,8 +216,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
public Page<SysUser> page(SysUserPageParam sysUserPageParam) {
QueryWrapper<SysUser> 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<SysUserMapper, SysUser> 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());