sugus/aircraft-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 完成管理员订单用户查询（数据权限待完善）

Browse Source
This commit is contained in:
chenxiky 2025-07-23 13:04:56 +08:00
parent b5566cdfe4
commit df80b16166
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
aircraft-system/src/main/java/com/aircraft/modules/order/biz/OrderBiz.java
View File

@ -177,9 +177,9 @@ public class OrderBiz {
* @return {@link List<OrderMain>} * @return {@link List<OrderMain>}
*/ */
private List<OrderMain> adminAllOrderQueryList(OrderMainPageQueryDTO pageQueryDTO) { private List<OrderMain> adminAllOrderQueryList(OrderMainPageQueryDTO pageQueryDTO) {
// 需要考虑用户角色获取对应的数据 // TODO 需要考虑用户角色获取对应的数据（财务、区域、管理员角色）
List<OrderMain> list = orderMainService.queryAll(pageQueryDTO); List<OrderMain> list = orderMainService.queryAll(pageQueryDTO);
return null; return list;
} }
public ResponseEntity<PageResult<Object>> relevanceOrder() { public ResponseEntity<PageResult<Object>> relevanceOrder() {

7
aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/OrderMainServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.aircraft.modules.order.service.impl; package com.aircraft.modules.order.service.impl;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.aircraft.modules.order.domain.OrderMain; import com.aircraft.modules.order.domain.OrderMain;
import com.aircraft.modules.order.domain.dto.OrderMainPageQueryDTO; import com.aircraft.modules.order.domain.dto.OrderMainPageQueryDTO;
@ -34,9 +35,9 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
// TODO 构建查询条件 // TODO 构建查询条件
LambdaQueryWrapper<OrderMain> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OrderMain> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(OrderMain::getAttractionId, pageQueryDTO.getAttractionId()); queryWrapper.eq(ObjectUtil.isNotNull(pageQueryDTO.getAttractionId()),OrderMain::getAttractionId, pageQueryDTO.getAttractionId());
queryWrapper.eq(OrderMain::getCustomerId, pageQueryDTO.getCustomerId()); queryWrapper.eq(ObjectUtil.isNotNull(pageQueryDTO.getAttractionId()),OrderMain::getCustomerId, pageQueryDTO.getCustomerId());
queryWrapper.eq(OrderMain::getPhone, pageQueryDTO.getPhone()); queryWrapper.eq(StrUtil.isNotBlank(pageQueryDTO.getPhone()),OrderMain::getPhone, pageQueryDTO.getPhone());
return list(queryWrapper); return list(queryWrapper);
} }