|
@@ -46,6 +46,21 @@ class OperationLogService extends Service
|
|
|
|
|
|
|
|
|
|
public function setOperationList($data,$user,$type=1,$menu_id=18){
|
|
public function setOperationList($data,$user,$type=1,$menu_id=18){
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ //获取oa参数
|
|
|
|
+ $key = 'menu_id'; // 要匹配的键
|
|
|
|
+ $value = $menu_id; // 要匹配的值
|
|
|
|
+
|
|
|
|
+ $result = array_filter( config('oa'), function($array) use ($key, $value) {
|
|
|
|
+ return $array[$key] == $value;
|
|
|
|
+ });
|
|
|
|
+ if(!isset($result['children'])) return [true,''];
|
|
|
|
+ $key_data = [];
|
|
|
|
+ foreach ($result['children'] as $v){
|
|
|
|
+ $key_data[$v['key']] = $v['title'];
|
|
|
|
+ }
|
|
$menu_id = $data['menu_id'];
|
|
$menu_id = $data['menu_id'];
|
|
$param = isset($data['order_number']) ? ['order_number'=>$data['order_number']]:['id'=>$data['id']];
|
|
$param = isset($data['order_number']) ? ['order_number'=>$data['order_number']]:['id'=>$data['id']];
|
|
$request = request();
|
|
$request = request();
|
|
@@ -55,6 +70,7 @@ class OperationLogService extends Service
|
|
$all = $request->all();
|
|
$all = $request->all();
|
|
if(!isset($all['order_number'])) $request->merge($param);
|
|
if(!isset($all['order_number'])) $request->merge($param);
|
|
$detail = $this->oaGetData($menu_id,$request);
|
|
$detail = $this->oaGetData($menu_id,$request);
|
|
|
|
+
|
|
try {
|
|
try {
|
|
DB::beginTransaction();
|
|
DB::beginTransaction();
|
|
$log = new OperationLog();
|
|
$log = new OperationLog();
|
|
@@ -64,7 +80,7 @@ class OperationLogService extends Service
|
|
$log->save();
|
|
$log->save();
|
|
$id = $log->id;
|
|
$id = $log->id;
|
|
$bind_data_detail = [];
|
|
$bind_data_detail = [];
|
|
- $key_data = [];
|
|
|
|
|
|
+
|
|
//以下是对比逻辑
|
|
//以下是对比逻辑
|
|
foreach ($data as $k=>$v){
|
|
foreach ($data as $k=>$v){
|
|
if(isset($detail[$k])&&isset($key_data[$k])&&$detail[$k] != $v){
|
|
if(isset($detail[$k])&&isset($key_data[$k])&&$detail[$k] != $v){
|