From 06e4db5a576c63c10ab4673dba017ffe1a3e7e66 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期五, 17 一月 2025 19:07:27 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile --- ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TInvoiceInformationController.java | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TInvoiceInformationController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TInvoiceInformationController.java index 5eb18cf..b5cfe15 100644 --- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TInvoiceInformationController.java +++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TInvoiceInformationController.java @@ -39,7 +39,8 @@ @ApiOperation(value = "获取开票抬头数据列表", tags = {"小程序-充电发票"}) public AjaxResult<List<InvoiceInformationVo>> getInvoiceInformationList(){ Long userId = tokenService.getLoginUserApplet().getUserId(); - List<TInvoiceInformation> list = invoiceInformationService.list(new LambdaQueryWrapper<TInvoiceInformation>().eq(TInvoiceInformation::getAppUserId, userId).eq(TInvoiceInformation::getDelFlag, 0)); + List<TInvoiceInformation> list = invoiceInformationService.list(new LambdaQueryWrapper<TInvoiceInformation>() + .eq(TInvoiceInformation::getAppUserId, userId).eq(TInvoiceInformation::getDelFlag, 0).orderByDesc(TInvoiceInformation::getIsDefault)); List<InvoiceInformationVo> lists = new ArrayList<>(); for (TInvoiceInformation tInvoiceInformation : list) { InvoiceInformationVo vo = new InvoiceInformationVo(); @@ -78,6 +79,10 @@ @ApiOperation(value = "获取开票抬头详情数据", tags = {"小程序-充电发票"}) public AjaxResult<TInvoiceInformation> getInvoiceInformationInfo(@PathVariable String id){ TInvoiceInformation information = invoiceInformationService.getById(id); + Long userId = tokenService.getLoginUserApplet().getUserId(); + if(!information.getAppUserId().equals(userId)){ + return AjaxResult.error("权限不足"); + } return AjaxResult.success(information); } @@ -88,8 +93,13 @@ @ApiOperation(value = "编辑开票抬头数据", tags = {"小程序-充电发票"}) public AjaxResult editInvoiceInformation(@RequestBody TInvoiceInformation invoiceInformation){ Long userId = tokenService.getLoginUserApplet().getUserId(); + TInvoiceInformation information = invoiceInformationService.getById(invoiceInformation.getId()); + if(!information.getAppUserId().equals(userId)){ + return AjaxResult.error("权限不足"); + } + //如果当前是默认抬头,则需要去除其他的默认配置 - if(1 == invoiceInformation.getIsDefault()){ + if(null != invoiceInformation.getIsDefault() && 1 == invoiceInformation.getIsDefault()){ TInvoiceInformation one = invoiceInformationService.getOne(new LambdaQueryWrapper<TInvoiceInformation>().eq(TInvoiceInformation::getDelFlag, 0) .eq(TInvoiceInformation::getIsDefault, 1).eq(TInvoiceInformation::getAppUserId, userId)); if(null != one && !one.getId().equals(invoiceInformation.getId())){ -- Gitblit v1.7.1