This commit is contained in:
weiz 2024-05-28 17:21:34 +08:00
parent 859f4e8c34
commit e20d19df42

View File

@ -106,19 +106,19 @@
{
$param = $this->request->post(['flow_id','check_admin_ids','copy_uids','extends']);
if(empty($param['flow_id'])){
return $this->fail("请选择审批流程",[],1,1);
return $this->fail("请选择审批流程");
}
$flow = Db::name('oa_flow')->where('id',$param['flow_id'])->find();
if(empty($flow)){
return $this->fail("审批流程信息不存在",[],1,1);
return $this->fail("审批流程信息不存在");
}
if($flow['check_type'] == 2){
if(empty($param['check_admin_ids'])){
return $this->fail("请选择审核人",[],1,1);
return $this->fail("请选择审核人");
}
}else{
if(empty($flow['flow_list'])){
return $this->fail("当前审批流程未设置完全",[],1,1);
return $this->fail("当前审批流程未设置完全");
}
}
if($flow['type'] == 1){
@ -128,7 +128,7 @@
//SELECT * FROM vx_live_room where info ->> 'name' like '%测试%'
$has = Db::name('oa_approve')->whereRaw("extends->'$.KSSJ.value' = '{$kssj}' and extends->'$.JSSJ.value' = '{$jssj}'")->find();
if(!empty($has)){
return $this->fail('当前时间已有请假申请',[],1,1);
return $this->fail('当前时间已有请假申请');
}
}
}
@ -143,11 +143,11 @@
//获取部门负责人
$dept = Admin::where('id',$this->adminId)->value('dept_id');
if(empty($dept)){
return $this->fail('当前用户未设置部门,请联系管理员',[],1,1);
return $this->fail('当前用户未设置部门,请联系管理员');
}
$leader = Dept::where('id',$dept)->value('leader_id');
if(empty($leader)){
return $this->fail('当前部门负责人还未设置,请联系管理员',[],1,1);
return $this->fail('当前部门负责人还未设置,请联系管理员');
}else{
$param['check_admin_ids'] = $leader;
}
@ -191,26 +191,26 @@
public function edit(){
$param = $this->request->post(['id','flow_id','check_admin_ids','copy_uids','extends']);
if(empty($param['id'])){
return $this->fail("id参数错误",[],1,1);
return $this->fail("id参数错误");
}
$data = Db::name('oa_approve')->where('id',$param['id'])->find();
if(empty($data)){
return $this->fail("数据信息不存在",[],1,1);
return $this->fail("数据信息不存在");
}
if(empty($param['flow_id'])){
return $this->fail("请选择审批流程",[],1,1);
return $this->fail("请选择审批流程");
}
$flow = Db::name('oa_flow')->where('id',$param['flow_id'])->find();
if(empty($flow)){
return $this->fail("审批流程信息不存在",[],1,1);
return $this->fail("审批流程信息不存在");
}
if($flow['check_type'] == 2){
if(empty($param['check_admin_ids'])){
return $this->fail("请选择审核人",[],1,1);
return $this->fail("请选择审核人");
}
}else{
if(empty($flow['flow_list'])){
return $this->fail("当前审批流程未设置完全",[],1,1);
return $this->fail("当前审批流程未设置完全");
}
}
$param['type'] = $flow['flow_cate'];
@ -227,11 +227,11 @@
//获取部门负责人
$dept = Admin::where('id',$this->adminId)->value('dept_id');
if(empty($dept)){
return $this->fail('当前用户未设置部门,请联系管理员',[],1,1);
return $this->fail('当前用户未设置部门,请联系管理员');
}
$leader = Dept::where('id',$dept)->value('leader_id',[],1,1);
$leader = Dept::where('id',$dept)->value('leader_id');
if(empty($leader)){
return $this->fail('当前部门负责人还未设置,请联系管理员',[],1,1);
return $this->fail('当前部门负责人还未设置,请联系管理员');
}else{
$param['check_admin_ids'] = $leader;
}