From 108299e4619b6b62b72528cb57aadf451a46871c Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Thu, 10 Oct 2024 10:34:08 +0800 Subject: [PATCH] =?UTF-8?q?VUL-009420=09=E6=96=BD=E5=B7=A5=E8=A3=85?= =?UTF-8?q?=E5=A4=87-=E7=BB=93=E7=AE=97=E4=BF=A1=E6=81=AF=E6=9C=88?= =?UTF-8?q?=E7=BB=93=E8=AE=B0=E5=BD=95=E5=AF=BC=E5=87=BA=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E8=A1=A8=E8=B6=8A=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/security/aspect/PreAuthorizeAspect.java | 6 ++---- .../controller/SltAgreementInfoController.java | 10 +++++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/sgzb-common/sgzb-common-security/src/main/java/com/bonus/sgzb/common/security/aspect/PreAuthorizeAspect.java b/sgzb-common/sgzb-common-security/src/main/java/com/bonus/sgzb/common/security/aspect/PreAuthorizeAspect.java index ff3c219..714166c 100644 --- a/sgzb-common/sgzb-common-security/src/main/java/com/bonus/sgzb/common/security/aspect/PreAuthorizeAspect.java +++ b/sgzb-common/sgzb-common-security/src/main/java/com/bonus/sgzb/common/security/aspect/PreAuthorizeAspect.java @@ -62,10 +62,8 @@ public class PreAuthorizeAspect //获取请求参数 boolean needPermission = true; Object[] args = joinPoint.getArgs(); - String argStr = JSON.toJSONString(args); - JSONArray jsonArray = JSONUtil.parseArray(argStr); - for (int i = 0; i < jsonArray.size(); i++) { - Object obj = jsonArray.getObj(i); + for (int i = 0; i < args.length; i++) { + Object obj = args[i]; if (Objects.nonNull(obj) && obj instanceof JSONObject) { JSONObject jsonObject = (JSONObject) obj; if ("1".equals(jsonObject.getStr("skipPermission"))) { diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SltAgreementInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SltAgreementInfoController.java index 5298a5a..563f9ce 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SltAgreementInfoController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SltAgreementInfoController.java @@ -21,6 +21,7 @@ import com.bonus.sgzb.material.service.SltAgreementInfoService; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -99,7 +100,7 @@ public class SltAgreementInfoController extends BaseController { } }*/ -// @RequiresPermissions("cost:settlement:export") + @RequiresPermissions("cost:settlement:export") @ApiOperation(value = "月结明细导出") @PostMapping("/exportSltInfoMonth") public void exportSltInfoMonth(HttpServletResponse response, @RequestBody List list) throws IOException { @@ -309,8 +310,11 @@ public class SltAgreementInfoController extends BaseController { ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), MonthRepairInfo.class).build(); for (int i = 0; i < lists.size(); i++) { - WriteSheet writeSheet = EasyExcel.writerSheet(lists.get(i).get(0).getProjectName()).build(); - excelWriter.write(lists.get(i), writeSheet); + List monthRepairInfoList = lists.get(i); + if (!CollectionUtils.isEmpty(monthRepairInfoList)) { + WriteSheet writeSheet = EasyExcel.writerSheet(monthRepairInfoList.get(0).getProjectName()).build(); + excelWriter.write(monthRepairInfoList, writeSheet); + } } // 关闭写入器