项目库--管理员删除

This commit is contained in:
zhn
2022-11-03 16:06:07 +08:00
parent 09ba8e6f77
commit 413b0b32e2
@@ -41,6 +41,7 @@ import com.jero.modules.system.enums.DicCodeEnum;
import com.jero.modules.system.mapper.SysDictItemMapper; import com.jero.modules.system.mapper.SysDictItemMapper;
import com.jero.modules.system.mapper.SysUserMapper; import com.jero.modules.system.mapper.SysUserMapper;
import com.jero.modules.system.service.ISysDictService; 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.service.impl.SysDictItemServiceImpl;
import com.jero.modules.system.util.StringUtils; import com.jero.modules.system.util.StringUtils;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
@@ -129,6 +130,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
@Autowired @Autowired
private ISysDictService sysDictService; private ISysDictService sysDictService;
@Autowired
private ISysUserService sysUserService;
/** /**
* 保存 * 保存
* *
@@ -340,7 +344,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
//判断该条项目是否是自己创建,如果不是则不能删除 //判断该条项目是否是自己创建,如果不是则不能删除
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
List<ProjectLibraryBase> projectLibraryBases = this.queryById(id,null); 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)){ if(CutEnum.CN.getValue().equals(cut)){
throw new JeroBootException("该条项目非本人创建,不能删除"); throw new JeroBootException("该条项目非本人创建,不能删除");
}else{ }else{