yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新清分数据对运营商ID的判断

Browse Source
This commit is contained in:
panshuling321 2022-04-28 11:15:23 +08:00
parent f005f0f431
commit 2f6129a832
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingHistoryOrderController.java
View File

@ -106,12 +106,12 @@ public class XhpcClearingHistoryOrderController extends BaseController {
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
params.put("tenantId", loginUser.getTenantId()); params.put("tenantId", loginUser.getTenantId());
if(StringUtils.isEmpty(operatorId)){ if(StringUtils.isEmpty(operatorId)){
operatorId = loginUser.getSysUser().getOperatorId().toString(); operatorId = loginUser.getSysUser().getOperatorId() + "";
} }
params.put("operatorId", operatorId); params.put("operatorId", operatorId);
if(params.get("operatorId") == null){ if(params.get("operatorId") == null || StringUtils.isEmpty(params.get("operatorId").toString()) || "null".equals(params.get("operatorId").toString())){
throw new CustomException("缺少运营商ID"); throw new CustomException("运营商ID错误,请登陆运营商账户再试");
} }
return getDataTable(orderService.getOrderPage(params)); return getDataTable(orderService.getOrderPage(params));
} }
@ -124,12 +124,12 @@ public class XhpcClearingHistoryOrderController extends BaseController {
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
params.put("tenantId", loginUser.getTenantId()); params.put("tenantId", loginUser.getTenantId());
if(StringUtils.isEmpty(operatorId)){ if(StringUtils.isEmpty(operatorId)){
operatorId = loginUser.getSysUser().getOperatorId().toString(); operatorId = loginUser.getSysUser().getOperatorId() + "";
} }
params.put("operatorId", operatorId); params.put("operatorId", operatorId);
if(params.get("operatorId") == null){ if(params.get("operatorId") == null || StringUtils.isEmpty(params.get("operatorId").toString()) || "null".equals(params.get("operatorId").toString())){
throw new CustomException("缺少运营商ID"); throw new CustomException("运营商ID错误,请登陆运营商账户再试");
} }
return R.ok(orderService.getOperatorData(params)); return R.ok(orderService.getOperatorData(params));