From 08dc1e3e4e0148faf745e5e45f6af27736618130 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 28 Apr 2022 12:05:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95--=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=B7=BB=E5=8A=A0=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLawsInventoryEOController.java | 12 ++++++---- .../IProjectLawsInventoryEOService.java | 4 ++-- .../ProjectLawsInventoryEOServiceImpl.java | 22 +++++++++++++++++-- 3 files changed, 30 insertions(+), 8 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java index c727f731c..4b343f21d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java @@ -128,8 +128,10 @@ public class ProjectLawsInventoryEOController extends JeroController delete(@RequestParam(name="id",required=true) String id) { - projectLawsInventoryEOService.deleteById(id); + public Result delete(@RequestParam(name="id",required=true) String id, + @RequestParam(name="projectLibraryId",required=true) String projectLibraryId, + @RequestParam(name="cut",required=true) String cut) { + projectLawsInventoryEOService.deleteById(id,projectLibraryId,cut); return Result.OK("删除成功!"); } @@ -142,8 +144,10 @@ public class ProjectLawsInventoryEOController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.projectLawsInventoryEOService.deleteByIds(Arrays.asList(ids.split(","))); + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids, + @RequestParam(name="projectLibraryId",required=true) String projectLibraryId, + @RequestParam(name="cut",required=true) String cut) { + this.projectLawsInventoryEOService.deleteByIds(Arrays.asList(ids.split(",")),projectLibraryId,cut); return Result.OK("批量删除成功!"); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java index c401bafc3..76e135215 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java @@ -39,7 +39,7 @@ public interface IProjectLawsInventoryEOService extends IService ids); + void deleteByIds(List ids,String projectLibraryId,String cut); /** * 通过id查询 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 011e67164..4cb328adf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -226,7 +226,16 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl ids) { + public void deleteByIds(List ids,String projectLibraryId,String cut) { + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + int isProjectRole = checkUserRole(projectLibraryId, currentUser.getId(),""); + if(!ProjectRoleEnum.STUDIO_ENGINEER.getValue().equals(String.valueOf(isProjectRole))){ + if(CutEnum.CN.getValue().equals(cut)){ + throw new JeroBootException("该用户没有删除权限"); + }else{ + throw new JeroBootException("The user has no deletion permission"); + } + } removeByIds(ids); }