|
|
@@ -62,20 +62,16 @@ class AssetLeaseLists extends BaseAdminDataLists implements ListsSearchInterface
|
|
|
$where = [] ;
|
|
|
if(!empty($parms))
|
|
|
{
|
|
|
- if(isset($parms['asset_name'])) {
|
|
|
- if (!empty($parms['asset_name'])) {
|
|
|
+ if(isset($parms['name'])) {
|
|
|
+ if (!empty($parms['name'])) {
|
|
|
$awhere = [];
|
|
|
- $awhere[] = ['name', 'like', '%' . $parms['asset_name'] . '%'];
|
|
|
+ $awhere[] = ['name', 'like', '%' . $parms['name'] . '%'];
|
|
|
$assetList = AssetInfo::where($awhere)->select()->toArray();
|
|
|
$a_id_Arr = array_column($assetList, 'id');
|
|
|
$where[] = ['a_id', 'in', $a_id_Arr];
|
|
|
}
|
|
|
}
|
|
|
- if(isset($parms['name'])) {
|
|
|
- if (!empty($parms['name'])) {
|
|
|
- $where[] = ['tenant_name', 'like', '%' . $parms['name'] . '%'];
|
|
|
- }
|
|
|
- }
|
|
|
+
|
|
|
// if(isset($parms['date_type'])) {
|
|
|
if (!empty($parms['create_time_start']) && !empty($parms['create_time_end'])) {
|
|
|
// if($parms['date_type'] == 1){
|
