|
@@ -90,6 +90,8 @@ class Info
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ $data['gotime'] = $data['worktime'];
|
|
|
|
+
|
|
return $data;
|
|
return $data;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -108,7 +110,7 @@ class Info
|
|
|
|
|
|
$county = Dever::db('area/county')->find($city);
|
|
$county = Dever::db('area/county')->find($city);
|
|
if ($county) {
|
|
if ($county) {
|
|
- $city = $county['id'];
|
|
|
|
|
|
+ $city = $county['city_id'];
|
|
}
|
|
}
|
|
if ($type == 1 && $city) {
|
|
if ($type == 1 && $city) {
|
|
$where .= ' and city = ' . $city;
|
|
$where .= ' and city = ' . $city;
|