|
@@ -193,20 +193,19 @@ class OperationLogService extends Service
|
|
return [true, $list_final];
|
|
return [true, $list_final];
|
|
}
|
|
}
|
|
|
|
|
|
- public function setOperationList($data, $user, $type = 1, $menu_id = 0)
|
|
|
|
|
|
+ public function setOperationList($data, $user, $type = 1)
|
|
{
|
|
{
|
|
- //获取oa参数
|
|
|
|
$key = 'menu_id'; // 要匹配的键
|
|
$key = 'menu_id'; // 要匹配的键
|
|
-// $value = $menu_id; // 要匹配的值
|
|
|
|
$value = $data['menu_id'];
|
|
$value = $data['menu_id'];
|
|
|
|
|
|
$result = array_filter(config('oa'), function ($array) use ($key, $value) {
|
|
$result = array_filter(config('oa'), function ($array) use ($key, $value) {
|
|
return $array[$key] == $value;
|
|
return $array[$key] == $value;
|
|
});
|
|
});
|
|
$result = array_values($result);
|
|
$result = array_values($result);
|
|
-
|
|
|
|
if (!isset($result[0]['children'])) return [true, ''];
|
|
if (!isset($result[0]['children'])) return [true, ''];
|
|
$result = $result[0];
|
|
$result = $result[0];
|
|
|
|
+
|
|
|
|
+ $menu_id = $data['menu_id'];
|
|
try {
|
|
try {
|
|
DB::beginTransaction();
|
|
DB::beginTransaction();
|
|
if ($type == 1) {
|
|
if ($type == 1) {
|
|
@@ -220,12 +219,12 @@ class OperationLogService extends Service
|
|
DB::commit();
|
|
DB::commit();
|
|
return [true, ''];
|
|
return [true, ''];
|
|
}
|
|
}
|
|
|
|
+
|
|
$key_data = [];
|
|
$key_data = [];
|
|
foreach ($result['children'] as $v) {
|
|
foreach ($result['children'] as $v) {
|
|
$key_data[$v['key']] = $v['title'];
|
|
$key_data[$v['key']] = $v['title'];
|
|
}
|
|
}
|
|
- $menu_id = $data['menu_id'];
|
|
|
|
- $opt_api_url = $data['opt_api_url'];
|
|
|
|
|
|
+ $opt_api_url = $data['opt_api_url'] ?? "";
|
|
|
|
|
|
//创建request副本对象 没有参数让检索出来的数据为空数组
|
|
//创建request副本对象 没有参数让检索出来的数据为空数组
|
|
$result_one['id'] = $data['id'] ?? -1;
|
|
$result_one['id'] = $data['id'] ?? -1;
|
|
@@ -253,7 +252,6 @@ class OperationLogService extends Service
|
|
|
|
|
|
//以下是对比逻辑
|
|
//以下是对比逻辑
|
|
foreach ($data as $k => $v) {
|
|
foreach ($data as $k => $v) {
|
|
-
|
|
|
|
if (isset($detail[$k]) && isset($key_data[$k]) ) {
|
|
if (isset($detail[$k]) && isset($key_data[$k]) ) {
|
|
$pattern = '/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/';
|
|
$pattern = '/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/';
|
|
$pattern1 = '/^\d{4}-\d{2}-\d{2}$/';
|
|
$pattern1 = '/^\d{4}-\d{2}-\d{2}$/';
|
|
@@ -280,6 +278,7 @@ class OperationLogService extends Service
|
|
}
|
|
}
|
|
}
|
|
}
|
|
OperationLogDetail::insert($bind_data_detail);
|
|
OperationLogDetail::insert($bind_data_detail);
|
|
|
|
+
|
|
DB::commit();
|
|
DB::commit();
|
|
return [true, ''];
|
|
return [true, ''];
|
|
} catch (\Exception $e) {
|
|
} catch (\Exception $e) {
|
|
@@ -290,6 +289,8 @@ class OperationLogService extends Service
|
|
|
|
|
|
public function oaGetData($opt_api_url, $request)
|
|
public function oaGetData($opt_api_url, $request)
|
|
{
|
|
{
|
|
|
|
+ if(empty($opt_api_url)) return [];
|
|
|
|
+
|
|
$path = $this->getMenu();
|
|
$path = $this->getMenu();
|
|
$control = '\\' . $path[$opt_api_url]["controller"];
|
|
$control = '\\' . $path[$opt_api_url]["controller"];
|
|
$act = $path[$opt_api_url]["act"];
|
|
$act = $path[$opt_api_url]["act"];
|