From 9a193669b8eb6b95b0ddff9696d914685815d904 Mon Sep 17 00:00:00 2001 From: "kuang.yife" Date: Wed, 14 Jun 2023 21:34:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B8=88=E5=82=85=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=88=86=E9=A1=B5bug=20+=20=E5=BE=85=E4=BB=98?= =?UTF-8?q?=E6=AC=BE=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/order/OrderDetailController.java | 2 +- .../ghy/web/controller/worker/WorkerController.java | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java index 09c93b3c..a41a66c2 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java @@ -128,7 +128,7 @@ public class OrderDetailController extends BaseController { List financialMasters = financialMasterService.selectByOrderMasterIds(orderMasterIds); Map financialMasterMap = new HashMap<>(); - if(0 == orderDetail.getSysPayStatus()){ + if(orderDetail.getSysPayStatus() != null && 0 == orderDetail.getSysPayStatus()){ financialMasterMap = financialMasters .stream().filter(financialMaster->0 == financialMaster.getPayStatus()).collect(Collectors.toMap(FinancialMaster::getOrderMasterId, x -> x, (x, y) -> y)); }else { diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java index d5b4cfa7..f5f51ddd 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java @@ -24,6 +24,7 @@ import com.ghy.worker.domain.WorkerArea; import com.ghy.worker.domain.WorkerBank; import com.ghy.worker.domain.WorkerGoodsCategory; import com.ghy.worker.service.*; +import com.github.pagehelper.PageInfo; import org.apache.commons.collections.CollectionUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.util.Assert; @@ -154,6 +155,7 @@ public class WorkerController extends BaseController { worker.setDeptId(this.getSysUser().getDept().getParentId()); } List list = workerService.getWorkList(worker); + TableDataInfo dataTable = getDataTable(list); list.forEach(w -> { Goods goods = new Goods(); goods.setWorkerId(w.getWorkerId()); @@ -164,13 +166,18 @@ public class WorkerController extends BaseController { workerListResponse.setGoodsCategories(workerGoodsCategoryService.getByWorker(w.getWorkerId())); workerListResponse.setSpecialSkills(specialSkillService.getByWorker(w.getWorkerId())); resList.add(workerListResponse); + }); + TableDataInfo rspData = new TableDataInfo(); + rspData.setCode(0); + rspData.setRows(resList); + rspData.setTotal(dataTable.getTotal()); + return rspData; } catch (Exception e) { e.printStackTrace(); logger.error(ExceptionUtil.getExceptionMessage(e)); + return getDataTable(new ArrayList<>()); } - - return getDataTable(resList); } @PostMapping("/app/list")