|
|
@@ -131,7 +131,9 @@ class Work extends Base{
|
|
|
public function delete(){
|
|
|
$id=$this->request->post("id/d");
|
|
|
$info = $this->model->findOrEmpty($id);
|
|
|
- if($info->isEmpty()) error('未找到数据');
|
|
|
+ if($info->isEmpty())return error('未找到数据');
|
|
|
+ $used = \app\bug\model\WorkRole::where('work_id','=',$id)->findOrEmpty();
|
|
|
+ if(!$used->isEmpty())return error('该岗位已使用，不能删除');
|
|
|
$add = $info->delete();
|
|
|
return $add ? success('删除成功'):error('删除失败');
|
|
|
}
|
|
|
@@ -288,7 +290,7 @@ class Work extends Base{
|
|
|
|
|
|
public function WorkTemplateInfo(){
|
|
|
$work_id=$this->request->post('work_id/d');
|
|
|
- $info= WorkTemplate::where(['work_id'=>$work_id])->findOrEmpty();
|
|
|
+ $info= WorkTemplate::with(["workInfo"])->where(['work_id'=>$work_id])->findOrEmpty();
|
|
|
if($info->isEmpty()) return error('未找到数据');
|
|
|
$info->actionInfo= (new WorkAction())->GetTreeActionByIdArr($info->action,$info->workInfo->belong);
|
|
|
return success('获取成功',$info);
|
