|
@@ -539,12 +539,12 @@ class ItemService extends Service
|
|
|
]);
|
|
]);
|
|
|
|
|
|
|
|
// 项目下的节点 如果有数据也要更新
|
|
// 项目下的节点 如果有数据也要更新
|
|
|
- $item_node = ItemNodeEmployee::where('item_id', $data['id'])
|
|
|
|
|
|
|
+ $item_node = ItemNodeEmployee::where('item_id', $id)
|
|
|
->where('type', ItemNodeEmployee::type_one)
|
|
->where('type', ItemNodeEmployee::type_one)
|
|
|
->where('data_id', $old_employee_id)
|
|
->where('data_id', $old_employee_id)
|
|
|
->select('item_id', 'item_node_id', 'top_depart_id')
|
|
->select('item_id', 'item_node_id', 'top_depart_id')
|
|
|
->get()->toArray();
|
|
->get()->toArray();
|
|
|
- ItemNodeEmployee::where('item_id', $data['id'])
|
|
|
|
|
|
|
+ ItemNodeEmployee::where('item_id', $id)
|
|
|
->where('type', ItemNodeEmployee::type_one)
|
|
->where('type', ItemNodeEmployee::type_one)
|
|
|
->where('data_id', $old_employee_id)
|
|
->where('data_id', $old_employee_id)
|
|
|
->delete();
|
|
->delete();
|
|
@@ -557,12 +557,12 @@ class ItemService extends Service
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 项目下的节点的任务 如果有数据也要更新
|
|
// 项目下的节点的任务 如果有数据也要更新
|
|
|
- $item_node_mission = ItemNodeMissionEmployee::where('item_id', $data['id'])
|
|
|
|
|
|
|
+ $item_node_mission = ItemNodeMissionEmployee::where('item_id', $id)
|
|
|
->where('type', ItemNodeMissionEmployee::type_one)
|
|
->where('type', ItemNodeMissionEmployee::type_one)
|
|
|
->where('data_id', $old_employee_id)
|
|
->where('data_id', $old_employee_id)
|
|
|
->select('item_id', 'item_node_id', 'item_node_mission_id', 'top_depart_id')
|
|
->select('item_id', 'item_node_id', 'item_node_mission_id', 'top_depart_id')
|
|
|
->get()->toArray();
|
|
->get()->toArray();
|
|
|
- ItemNodeMissionEmployee::where('item_id', $data['id'])
|
|
|
|
|
|
|
+ ItemNodeMissionEmployee::where('item_id', $id)
|
|
|
->where('type', ItemNodeMissionEmployee::type_one)
|
|
->where('type', ItemNodeMissionEmployee::type_one)
|
|
|
->where('data_id', $old_employee_id)
|
|
->where('data_id', $old_employee_id)
|
|
|
->delete();
|
|
->delete();
|
|
@@ -1244,7 +1244,7 @@ class ItemService extends Service
|
|
|
DB::commit();
|
|
DB::commit();
|
|
|
}catch (\Exception $exception){
|
|
}catch (\Exception $exception){
|
|
|
DB::rollBack();
|
|
DB::rollBack();
|
|
|
- return [false,$exception->getMessage()];
|
|
|
|
|
|
|
+ return [false,$exception->getMessage() . $exception->getLine()];
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
return [true, ''];
|
|
return [true, ''];
|
|
@@ -1330,12 +1330,12 @@ class ItemService extends Service
|
|
|
]);
|
|
]);
|
|
|
|
|
|
|
|
//如果任务有数据 也需要更新
|
|
//如果任务有数据 也需要更新
|
|
|
- $item_node_mission = ItemNodeMissionEmployee::where('item_node_id', $data['id'])
|
|
|
|
|
|
|
+ $item_node_mission = ItemNodeMissionEmployee::where('item_node_id', $id)
|
|
|
->where('type', ItemNodeMissionEmployee::type_two)
|
|
->where('type', ItemNodeMissionEmployee::type_two)
|
|
|
->where('data_id', $old_employee_id)
|
|
->where('data_id', $old_employee_id)
|
|
|
->select('item_id', 'item_node_id', 'item_node_mission_id', 'top_depart_id')
|
|
->select('item_id', 'item_node_id', 'item_node_mission_id', 'top_depart_id')
|
|
|
->get()->toArray();
|
|
->get()->toArray();
|
|
|
- ItemNodeMissionEmployee::where('item_id', $data['id'])
|
|
|
|
|
|
|
+ ItemNodeMissionEmployee::where('item_id', $id)
|
|
|
->where('type', ItemNodeMissionEmployee::type_two)
|
|
->where('type', ItemNodeMissionEmployee::type_two)
|
|
|
->where('data_id', $old_employee_id)
|
|
->where('data_id', $old_employee_id)
|
|
|
->delete();
|
|
->delete();
|