root/material-manage-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

~

Browse Source
This commit is contained in:
淋雨一直走YH
2023-10-06 20:46:28 +08:00
parent 7bc57c75dc
commit c45d3ed75d
10 changed files with 126 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mjkf-xinke-plugin/mjkf-xinke-plugin-biz/src/main/java/mjkf/xinke/biz/modular/dict/service/impl/BizDictServiceImpl.java
View File

@@ -52,8 +52,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
mjkf-xinke-plugin/mjkf-xinke-plugin-biz/src/main/java/mjkf/xinke/biz/modular/user/service/impl/BizUserServiceImpl.java
View File

@@ -120,8 +120,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());
@@ -412,9 +412,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());