|
@@ -201,7 +201,7 @@
|
|
|
FROM msg_alarm m JOIN base_camera_management c ON m.camera_code=c.camera_code
|
|
|
<where>
|
|
|
<if test="ids != null and ids.size>0">
|
|
|
- and a.id in
|
|
|
+ and c.id in
|
|
|
<foreach item="items" collection="ids" separator="," open="(" close=")" index="">
|
|
|
#{items}
|
|
|
</foreach>
|
|
@@ -210,13 +210,13 @@
|
|
|
and
|
|
|
<trim prefix="(" prefixOverrides="or" suffix=")">
|
|
|
<if test="dsUserId != null and dsUserId != ''">
|
|
|
- or a.create_by=#{dsUserId}
|
|
|
+ or c.create_by=#{dsUserId}
|
|
|
</if>
|
|
|
<if test="dsDeptId != null and dsDeptId != 0">
|
|
|
- or b.dept_id=#{dsDeptId}
|
|
|
+ or c.dept_id=#{dsDeptId}
|
|
|
</if>
|
|
|
<if test="dsDeptIds != null">
|
|
|
- or b.dept_id in
|
|
|
+ or c.dept_id in
|
|
|
<foreach item="item" collection="dsDeptIds" separator="," open="(" close=")" index="">
|
|
|
#{item}
|
|
|
</foreach>
|