blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-10-27 18:32:08 +08:00
Code Issues Projects Releases Wiki Activity

[更新]修改Db兼容获取方式

Browse Source
This commit is contained in:
Anyon 2017-05-25 11:21:16 +08:00
parent bcc96f37a3
commit 05e0543509
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
extend/service/DataService.php
View File

@ -60,16 +60,14 @@ class DataService {
/** /**
* 数据增量保存 * 数据增量保存
* @param \think\db\Query|string $db 数据查询对象 * @param \think\db\Query|string $dbQuery 数据查询对象
* @param array $data 需要保存或更新的数据 * @param array $data 需要保存或更新的数据
* @param string $upkey 条件主键限制 * @param string $upkey 条件主键限制
* @param array $where 其它的where条件 * @param array $where 其它的where条件
* @return bool * @return bool
*/ */
public static function save($db, $data, $upkey = 'id', $where = []) { public static function save($dbQuery, $data, $upkey = 'id', $where = []) {
if (is_string($db)) { $db = is_string($dbQuery) ? Db::name($dbQuery) : $dbQuery;
$db = Db::name($db);
}
$fields = $db->getTableFields(['table' => $db->getTable()]); $fields = $db->getTableFields(['table' => $db->getTable()]);
$_data = []; $_data = [];
foreach ($data as $k => $v) { foreach ($data as $k => $v) {
@ -102,14 +100,12 @@ class DataService {
/** /**
* 更新数据表内容 * 更新数据表内容
* @param \think\db\Query|string $db 数据查询对象 * @param \think\db\Query|string $dbQuery 数据查询对象
* @param array $where 额外查询条件 * @param array $where 额外查询条件
* @return bool|null * @return bool|null
*/ */
public static function update(&$db, $where = []) { public static function update(&$dbQuery, $where = []) {
if (is_string($db)) { $db = is_string($dbQuery) ? Db::name($dbQuery) : $dbQuery;
$db = Db::name($db);
}
$ids = explode(',', input("post.id", '')); $ids = explode(',', input("post.id", ''));
$field = input('post.field', ''); $field = input('post.field', '');
$value = input('post.value', ''); $value = input('post.value', '');

4
extend/service/LogService.php
View File

@ -1,4 +1,5 @@
<?php <?php
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | Think.Admin // | Think.Admin
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
@ -33,7 +34,6 @@ class LogService {
return Db::name('SystemLog'); return Db::name('SystemLog');
} }
/** /**
* 写入操作日志 * 写入操作日志
* @param string $action * @param string $action
@ -47,4 +47,4 @@ class LogService {
return self::db()->insert($data) !== false; return self::db()->insert($data) !== false;
} }
} }