Commit 96983883 by 杨树贤

修复

parent 1ba20ec2
......@@ -12,7 +12,12 @@ class SupplierContractFilter
{
$map = $request->all();
$model = new SupplierContractModel();
$query = $model->with('supplier')->where('create_uid', $request->user->userId)->orderBy('id', 'desc');
$query = $model->with('supplier');
$userId = $request->user->userId;
if ($userId!=1000) {
$query = $query->where('create_uid', $userId);
}
$query = $query->orderBy('id', 'desc');
if (!empty($map['supplier_code'])) {
$supplierId = SupplierChannelModel::where('supplier_code', $map['supplier_code'])->value('supplier_id');
$query->where('supplier_id', $supplierId);
......
......@@ -98,9 +98,15 @@ class SupplierContractService
if ($fileData['code'] == 0) {
$data['contract_file'] = $fileData['data']['oss_file_url'];
if (!empty($data['id'])) {
SupplierContractModel::where('id', $data['id'])->update([
$udpateData = [
'contract_file' => $fileData['data']['oss_file_url'],
]);
];
$contractNo = SupplierContractModel::where('id', $data['id'])->value('contract_no');
if (empty($contractNo)) {
$contractNo = $this->generateContractNo($data['id']);
$udpateData['contract_no'] = $contractNo;
}
SupplierContractModel::where('id', $data['id'])->update($udpateData);
} else {
SupplierContractModel::insert([
'contract_file' => $fileData['data']['oss_file_url'],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment