From 2f6129a83252f2f01e9b35c044f71ab6aac96686 Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Thu, 28 Apr 2022 11:15:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B8=85=E5=88=86=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=AF=B9=E8=BF=90=E8=90=A5=E5=95=86ID=E7=9A=84?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XhpcClearingHistoryOrderController.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingHistoryOrderController.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingHistoryOrderController.java index d94a0283..ed75b1d1 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingHistoryOrderController.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingHistoryOrderController.java @@ -106,12 +106,12 @@ public class XhpcClearingHistoryOrderController extends BaseController { Map params = new HashMap<>(); params.put("tenantId", loginUser.getTenantId()); if(StringUtils.isEmpty(operatorId)){ - operatorId = loginUser.getSysUser().getOperatorId().toString(); + operatorId = loginUser.getSysUser().getOperatorId() + ""; } params.put("operatorId", operatorId); - if(params.get("operatorId") == null){ - throw new CustomException("缺少运营商ID"); + if(params.get("operatorId") == null || StringUtils.isEmpty(params.get("operatorId").toString()) || "null".equals(params.get("operatorId").toString())){ + throw new CustomException("运营商ID错误,请登陆运营商账户再试"); } return getDataTable(orderService.getOrderPage(params)); } @@ -124,12 +124,12 @@ public class XhpcClearingHistoryOrderController extends BaseController { Map params = new HashMap<>(); params.put("tenantId", loginUser.getTenantId()); if(StringUtils.isEmpty(operatorId)){ - operatorId = loginUser.getSysUser().getOperatorId().toString(); + operatorId = loginUser.getSysUser().getOperatorId() + ""; } params.put("operatorId", operatorId); - if(params.get("operatorId") == null){ - throw new CustomException("缺少运营商ID"); + if(params.get("operatorId") == null || StringUtils.isEmpty(params.get("operatorId").toString()) || "null".equals(params.get("operatorId").toString())){ + throw new CustomException("运营商ID错误,请登陆运营商账户再试"); } return R.ok(orderService.getOperatorData(params));