|
@@ -20,7 +20,7 @@
|
|
inner join device_status as ds
|
|
inner join device_status as ds
|
|
on us.site_id = ds.site_id
|
|
on us.site_id = ds.site_id
|
|
inner join device as d
|
|
inner join device as d
|
|
- on us.site_id = d.site_Id
|
|
|
|
|
|
+ on ds.device_code = d.device_code
|
|
<where>
|
|
<where>
|
|
<if test="userId != null and userId != 0">
|
|
<if test="userId != null and userId != 0">
|
|
and us.user_id = #{userId}
|
|
and us.user_id = #{userId}
|