From 859f4e8c3419fee287d7ce95b116d91b510ef823 Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Tue, 28 May 2024 17:19:08 +0800
Subject: [PATCH] update

---
 .../works/bgsp/OaApproveController.php        | 41 ++++++++++++-------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/app/adminapi/controller/works/bgsp/OaApproveController.php b/app/adminapi/controller/works/bgsp/OaApproveController.php
index 5200418f2..01ad8937c 100644
--- a/app/adminapi/controller/works/bgsp/OaApproveController.php
+++ b/app/adminapi/controller/works/bgsp/OaApproveController.php
@@ -106,19 +106,30 @@
 		{
 			$param = $this->request->post(['flow_id','check_admin_ids','copy_uids','extends']);
 			if(empty($param['flow_id'])){
-				return $this->fail("请选择审批流程");
+				return $this->fail("请选择审批流程",[],1,1);
 			}
 			$flow = Db::name('oa_flow')->where('id',$param['flow_id'])->find();
 			if(empty($flow)){
-				return $this->fail("审批流程信息不存在");
+				return $this->fail("审批流程信息不存在",[],1,1);
 			}
 			if($flow['check_type'] == 2){
 				if(empty($param['check_admin_ids'])){
-					return $this->fail("请选择审核人");
+					return $this->fail("请选择审核人",[],1,1);
 				}
 			}else{
 				if(empty($flow['flow_list'])){
-					return $this->fail("当前审批流程未设置完全");
+					return $this->fail("当前审批流程未设置完全",[],1,1);
+				}
+			}
+			if($flow['type'] == 1){
+				if(!empty($param['extends']['KSSJ']['value']) && !empty($param['extends']['JSSJ']['value'])){
+					$kssj = $param['extends']['KSSJ']['value'];
+					$jssj = $param['extends']['JSSJ']['value'];
+					//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);
+					}
 				}
 			}
 			$param['admin_id'] = $this->adminId;
@@ -132,11 +143,11 @@
 					//获取部门负责人
 					$dept = Admin::where('id',$this->adminId)->value('dept_id');
 					if(empty($dept)){
-						return $this->fail('当前用户未设置部门，请联系管理员');
+						return $this->fail('当前用户未设置部门，请联系管理员',[],1,1);
 					}
 					$leader = Dept::where('id',$dept)->value('leader_id');
 					if(empty($leader)){
-						return $this->fail('当前部门负责人还未设置，请联系管理员');
+						return $this->fail('当前部门负责人还未设置，请联系管理员',[],1,1);
 					}else{
 						$param['check_admin_ids'] = $leader;
 					}
@@ -180,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参数错误");
+				return $this->fail("id参数错误",[],1,1);
 			}
 			$data = Db::name('oa_approve')->where('id',$param['id'])->find();
 			if(empty($data)){
-				return $this->fail("数据信息不存在");
+				return $this->fail("数据信息不存在",[],1,1);
 			}
 			if(empty($param['flow_id'])){
-				return $this->fail("请选择审批流程");
+				return $this->fail("请选择审批流程",[],1,1);
 			}
 			$flow = Db::name('oa_flow')->where('id',$param['flow_id'])->find();
 			if(empty($flow)){
-				return $this->fail("审批流程信息不存在");
+				return $this->fail("审批流程信息不存在",[],1,1);
 			}
 			if($flow['check_type'] == 2){
 				if(empty($param['check_admin_ids'])){
-					return $this->fail("请选择审核人");
+					return $this->fail("请选择审核人",[],1,1);
 				}
 			}else{
 				if(empty($flow['flow_list'])){
-					return $this->fail("当前审批流程未设置完全");
+					return $this->fail("当前审批流程未设置完全",[],1,1);
 				}
 			}
 			$param['type'] = $flow['flow_cate'];
@@ -216,11 +227,11 @@
 					//获取部门负责人
 					$dept = Admin::where('id',$this->adminId)->value('dept_id');
 					if(empty($dept)){
-						return $this->fail('当前用户未设置部门，请联系管理员');
+						return $this->fail('当前用户未设置部门，请联系管理员',[],1,1);
 					}
-					$leader = Dept::where('id',$dept)->value('leader_id');
+					$leader = Dept::where('id',$dept)->value('leader_id',[],1,1);
 					if(empty($leader)){
-						return $this->fail('当前部门负责人还未设置，请联系管理员');
+						return $this->fail('当前部门负责人还未设置，请联系管理员',[],1,1);
 					}else{
 						$param['check_admin_ids'] = $leader;
 					}