|
|
@@ -110,10 +110,10 @@
|
|
|
<foreach item="sourceId" collection="param.sourceList" open="(" separator="," close=")">
|
|
|
#{sourceId}
|
|
|
</foreach>
|
|
|
- <if test="param.folderId == null">
|
|
|
+ <if test="param.folderId == null and param.hasFolder == 1 ">
|
|
|
AND p.id not in(SELECT scene_id FROM t_folder_scene where rec_status = 'A')
|
|
|
</if>
|
|
|
- <if test="param.folderId != null">
|
|
|
+ <if test="param.folderId != null param.hasFolder == 1">
|
|
|
AND p.id in (SELECT scene_id FROM t_folder_scene where rec_status= 'A' and folder_id =#{param.folderId} )
|
|
|
</if>
|
|
|
<if test="param.numList !=null and param.numList.size >0">
|
lyhzzz