|
|
@@ -10,7 +10,7 @@
|
|
|
,d.DEVICE_TYPE_ID as "deviceTypeId"
|
|
|
,d.COMPANY_ORG_ID as "companyOrgId"
|
|
|
,d.DEPT_ORG_ID as "deptOrgId"
|
|
|
- ,d.SCENE_ID as "sceneId"
|
|
|
+ ,s.SCENE_ID as "sceneId"
|
|
|
,d.POINT_X as "pointX"
|
|
|
,d.POINT_Y as "pointY"
|
|
|
,d.ENABLE_STATE as "enableState"
|
|
|
@@ -290,12 +290,6 @@
|
|
|
<if test="deviceDto.deptOrgId != null and deviceDto.deptOrgId != 0">
|
|
|
and d.DEPT_ORG_ID =#{deviceDto.deptOrgId}
|
|
|
</if>
|
|
|
- <if test="deviceDto.sceneIds != null and deviceDto.sceneIds.size() > 0">
|
|
|
- and d.SCENE_ID in
|
|
|
- <foreach collection="deviceDto.sceneIds" item="item" open="(" close=")" separator=",">
|
|
|
- #{item}
|
|
|
- </foreach>
|
|
|
- </if>
|
|
|
<if test="deviceDto.enableState != null ">
|
|
|
and d.ENABLE_STATE =#{deviceDto.enableState}
|
|
|
</if>
|
wangli