mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-07 15:12:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

改进saveall方法

Browse Source
This commit is contained in:
thinkphp
2016-08-20 14:47:23 +08:00
parent 3454e8a13c
commit 5cc1448a83
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/think/Model.php
View File

@@ -730,7 +730,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
* @access public * @access public
* @param array $dataSet 数据 * @param array $dataSet 数据
* @param boolean $replace 是否自动识别更新和写入 * @param boolean $replace 是否自动识别更新和写入
* @return array|false * @return array
*/ */
public function saveAll($dataSet, $replace = true) public function saveAll($dataSet, $replace = true)
{ {
@@ -738,8 +738,12 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
$db = $this->db(); $db = $this->db();
$db->startTrans(); $db->startTrans();
try { try {
$pk = $this->getPk();
if (is_string($pk) && $replace) {
$auto = true;
}
foreach ($dataSet as $key => $data) { foreach ($dataSet as $key => $data) {
if ($replace && isset($data[$this->getPk()])) { if (!empty($auto) && isset($data[$pk])) {
$result[$key] = self::update($data); $result[$key] = self::update($data);
} else { } else {
$result[$key] = self::create($data); $result[$key] = self::create($data);