From 413b0b32e27c44d949a480e0a7354818ad704d01 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 3 Nov 2022 16:06:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93--=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectLibraryBaseServiceImpl.java       | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index 19caa49cd..f6ad08d25 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -41,6 +41,7 @@ import com.jero.modules.system.enums.DicCodeEnum;
 import com.jero.modules.system.mapper.SysDictItemMapper;
 import com.jero.modules.system.mapper.SysUserMapper;
 import com.jero.modules.system.service.ISysDictService;
+import com.jero.modules.system.service.ISysUserService;
 import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
 import com.jero.modules.system.util.StringUtils;
 import org.apache.commons.collections4.CollectionUtils;
@@ -129,6 +130,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 	@Autowired
 	private ISysDictService sysDictService;
 
+	@Autowired
+	private ISysUserService sysUserService;
+
 	/**
 	 * 保存
 	 *
@@ -340,7 +344,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		//判断该条项目是否是自己创建,如果不是则不能删除
 		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		List<ProjectLibraryBase> projectLibraryBases = this.queryById(id,null);
-		if(!loginUser.getUsername().equals(projectLibraryBases.get(0).getCreateBy())){
+		//管理员和创建人可以删除,其余人不能删除
+		boolean administrator = sysUserService.isAdministrator();
+		if(!loginUser.getUsername().equals(projectLibraryBases.get(0).getCreateBy()) && !administrator){
 			if(CutEnum.CN.getValue().equals(cut)){
 				throw new JeroBootException("该条项目非本人创建,不能删除");
 			}else{