czg_team
/
cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Tankaikai 2025-02-13 15:34:31 +08:00
parent 7a0563a434 79d1f51a3f
commit 140f9344e0
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cash-common/cash-common-tools/src/main/java/com/czg/utils/PageUtil.java
View File

@ -69,7 +69,7 @@ public class PageUtil {
*
* @return QueryWrapper
*/
public QueryWrapper buildPageQueryWrapper() {
public QueryWrapper buildSortQueryWrapper() {
QueryWrapper queryWrapper = QueryWrapper.create();
String orderBy = ServletUtil.getRequest().getParameter(ORDER_BY);
if (StrUtil.isNotEmpty(orderBy)) {

2
cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProdUnitServiceImpl.java
View File

@ -31,7 +31,7 @@ import java.util.List;
public class ShopProdUnitServiceImpl extends ServiceImpl<ShopProdUnitMapper, ShopProdUnit> implements ShopProdUnitService {
private QueryWrapper buildQueryWrapper(ShopProdUnitDTO param) {
QueryWrapper queryWrapper = PageUtil.buildPageQueryWrapper();
QueryWrapper queryWrapper = PageUtil.buildSortQueryWrapper();
if (StrUtil.isNotEmpty(param.getName())) {
queryWrapper.like(ShopProdUnit::getName, param.getName());
}

2
cash-service/system-service/src/main/java/com/czg/service/system/service/impl/OperationLogServiceImpl.java
View File

@ -26,7 +26,7 @@ import java.util.List;
public class OperationLogServiceImpl extends ServiceImpl<OperationLogMapper, OperationLog> implements OperationLogService {
private QueryWrapper buildQueryWrapper(OperationLogDTO param) {
QueryWrapper queryWrapper = PageUtil.buildPageQueryWrapper();
QueryWrapper queryWrapper = PageUtil.buildSortQueryWrapper();
if (StrUtil.isNotEmpty(param.getOperation())) {
queryWrapper.like(OperationLog::getOperation, param.getOperation());
}