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));