作者 张关杰

Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

... ... @@ -165,9 +165,14 @@ class BaseController extends Controller
}
break;
case 'file':
case 'video':
$data['file_link'] = url('/b/file_hash/' . $v);
break;
case 'video':
$v = explode(',',$v);
foreach ($v as $k1=>$v1){
$data['file_link'][$k1] = url('/b/file_hash/' . $v1);
}
break;
case 'operator_id':
if(!empty($v)){
$name = (new UserModel())->read(['id'=>$v],['id','name']);
... ...
... ... @@ -87,7 +87,7 @@ class Base extends Model
public function list($map = [],$order = 'id',$fields = ['*']): array
{
$query = $this->formatQuery($map);
$lists = $query->select($fields)->orderBy($order)->get();
$lists = $query->select($fields)->orderBy($order,'desc')->get();
if (empty($lists)) {
return [];
}
... ...