20190927

WuKongOpenSource · Sep 27, 2019 · ddd6bd0 · ddd6bd0
1 parent 60b31bf
commit ddd6bd0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/application/admin/model/Record.php b/application/admin/model/Record.php
@@ -348,10 +348,10 @@ public function getDataList($request, $by = '')
 			}
 			$dataInfo['fileList'] = $fileList ? : [];
 			$dataInfo['imgList'] = $imgList ? : [];
-			$dataInfo['customerList'] = $relation_list['customer_list'] ? : [];
-			$dataInfo['contactsList'] = $relation_list['contacts_list'] ? : [];
-			$dataInfo['businessList'] = $relation_list['business_list'] ? : [];
-			$dataInfo['contractList'] = $relation_list['contract_list'] ? : [];
+			$dataInfo['customerList'] = $relation_list['customerList'] ? : [];
+			$dataInfo['contactsList'] = $relation_list['contactsList'] ? : [];
+			$dataInfo['businessList'] = $relation_list['businessList'] ? : [];
+			$dataInfo['contractList'] = $relation_list['contractList'] ? : [];
 			$list[$k]['dataInfo'] = $dataInfo ? : [];
 		}
         $data = [];
@@ -474,10 +474,10 @@ public function getListByRelationId($relation, $relation_id)
 			case 'record' : $data = db('admin_record')->where(['record_id' => $relation_id])->find(); break;
 			default : $data = []; break;
 		}
-		if ($data['customer_ids']) $data['customer_list'] = $CustomerModel->getDataByStr($data['customer_ids']) ? : [];
-		if ($data['contacts_ids']) $data['contacts_list'] = $ContactsModel->getDataByStr($data['contacts_ids']) ? : [];
-		if ($data['business_ids']) $data['business_list'] = $BusinessModel->getDataByStr($data['business_ids']) ? : [];
-		if ($data['contract_ids']) $data['contract_list'] = $ContractModel->getDataByStr($data['contract_ids']) ? : [];
+		$data['customerList'] = $data['customer_ids'] ? $CustomerModel->getDataByStr($data['customer_ids']) : [];
+		$data['contactsList'] = $data['contacts_ids'] ? $ContactsModel->getDataByStr($data['contacts_ids']) : [];
+		$data['businessList'] = $data['business_ids'] ? $BusinessModel->getDataByStr($data['business_ids']) : [];
+		$data['contractList'] = $data['contract_ids'] ? $ContractModel->getDataByStr($data['contract_ids']) : [];
 		return $data ? : [];
 	}
 

diff --git a/application/oa/model/Examine.php b/application/oa/model/Examine.php
@@ -121,10 +121,10 @@ public function getDataList($request)
 			//关联业务
 			$relationArr= [];
 			$relationArr = $recordModel->getListByRelationId('examine', $v['examine_id']); 
-			$$relationArr['businessList'] = $relationArr['businessList'];
-			$$relationArr['contactsList'] = $relationArr['contactsList'];
-			$$relationArr['contractList'] = $relationArr['contractList'];
-			$$relationArr['customerList'] = $relationArr['customerList'];			
+			$list[$k]['businessList'] = $relationArr['businessList'];
+			$list[$k]['contactsList'] = $relationArr['contactsList'];
+			$list[$k]['contractList'] = $relationArr['contractList'];
+			$list[$k]['customerList'] = $relationArr['customerList'];			
 
 			//附件
 			$fileList = [];