From c431fb0853c539981d1a7fea987b5c11ba501d38 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 29 Jul 2024 16:49:31 +0800 Subject: [PATCH] =?UTF-8?q?fix=2087698=20=E5=B9=B4=E5=BA=A6=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=94=81=E5=AE=9A--=E5=BD=93=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=9D=83=E9=99=90=E6=97=B6=EF=BC=8C=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=8D=B4=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AnnualDataLockingController.java | 50 +++---------------- .../PayWorkingGroupSubItemContactsMapper.java | 6 +++ .../service/AnnualDataLockingService.java | 7 ++- 3 files changed, 18 insertions(+), 45 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/AnnualDataLockingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/AnnualDataLockingController.java index 1f6b6288..87b702b0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/AnnualDataLockingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/AnnualDataLockingController.java @@ -15,6 +15,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -44,6 +45,7 @@ public class AnnualDataLockingController extends JeroController> queryPageList(AnnualDataLocking annualDataLocking, @@ -59,6 +61,7 @@ public class AnnualDataLockingController extends JeroController> queryList(AnnualDataLocking annualDataLocking, @@ -71,6 +74,7 @@ public class AnnualDataLockingController extends JeroController edit(@Validated @RequestBody AnnualDataLocking annualDataLocking) { - annualDataLockingService.editById(annualDataLocking); - return Result.OK(Result.EDIT_SUCCESS); - } - /** * 通过id删除 */ + @RequiresPermissions("annualDataLockingList:delete") @AutoLog(value = "年度数据锁定表-通过id删除") @ApiOperation(value = "年度数据锁定表-通过id删除", notes = "年度数据锁定表-通过id删除") @PostMapping(value = "/delete") @@ -108,6 +102,7 @@ public class AnnualDataLockingController extends JeroController queryById(@RequestParam(name = "id") String id) { - AnnualDataLocking annualDataLocking = annualDataLockingService.queryById(id); - if (annualDataLocking == null) { - throw new JeroBootException(Result.NULL_DATA); - } - return Result.OK(annualDataLocking); - } - - /** - * 导出excel - */ - @ApiOperation(value = "年度数据锁定表-导出excel") - @GetMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, AnnualDataLocking annualDataLocking) { - return super.exportXls(request, annualDataLocking, AnnualDataLocking.class, "年度数据锁定表"); - } - - /** - * 通过excel导入数据 - */ - @ApiOperation(value = "年度数据锁定表-通过excel导入数据") - @PostMapping(value = "/importExcel") - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, AnnualDataLocking.class); - } - - } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubItemContactsMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubItemContactsMapper.java index 3b26f3bc..a2910dc2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubItemContactsMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubItemContactsMapper.java @@ -1,6 +1,9 @@ package com.jero.project.mapper; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.StringUtils; + +import java.util.ArrayList; import java.util.Collection; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -27,6 +30,9 @@ public interface PayWorkingGroupSubItemContactsMapper extends BaseMapper getSubItemContacts(@Param("workingGroupSubId") String workingGroupSubId); default List listByWorkingGroupSubIdIn(Collection workingGroupSubIdCollection) { + if (CollectionUtil.isEmpty(workingGroupSubIdCollection)){ + return new ArrayList<>(); + } LambdaQueryWrapper myQuery = Wrappers.lambdaQuery(PayWorkingGroupSubItemContacts.class); myQuery.in(PayWorkingGroupSubItemContacts::getWorkingGroupSubId, workingGroupSubIdCollection); return selectList(myQuery); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java index f8537af4..9e899a5f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java @@ -105,8 +105,13 @@ public class AnnualDataLockingService extends ServiceImpl meetingSituations = meetingSituationMapper.listByYear(year); List workingGroupSubItems = payWorkingGroupSubItemMapper.listByYear(year);