|
|
|
@@ -165,10 +165,10 @@ public class ExperimentServiceImpl implements ExperimentService { |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public String removeById(Integer id) { |
|
|
|
public String removeById(Integer id) throws Exception { |
|
|
|
Experiment experiment = experimentDao.queryById(id); |
|
|
|
if (experiment==null){ |
|
|
|
return "实验不存在"; |
|
|
|
throw new Exception("实验不存在"); |
|
|
|
} |
|
|
|
|
|
|
|
//判断权限,只有admin和创建者本身可以删除该实验 |
|
|
|
@@ -176,12 +176,12 @@ public class ExperimentServiceImpl implements ExperimentService { |
|
|
|
String username = loginUser.getUsername(); |
|
|
|
String createdBy = experiment.getCreateBy(); |
|
|
|
if (!(StringUtils.equals(username,"admin") || StringUtils.equals(username,createdBy))){ |
|
|
|
return "无权限删除该实验"; |
|
|
|
throw new Exception("无权限删除该实验"); |
|
|
|
} |
|
|
|
|
|
|
|
List<ExperimentIns> experimentInsList = experimentInsService.queryByExperimentId(experiment.getId()); |
|
|
|
if (experimentInsList!=null&&experimentInsList.size()>0){ |
|
|
|
return "该实验存在实例,无法删除"; |
|
|
|
throw new Exception("该实验存在实例,无法删除"); |
|
|
|
} |
|
|
|
experiment.setState(0); |
|
|
|
return this.experimentDao.update(experiment)>0?"删除成功":"删除失败"; |
|
|
|
|