|
@@ -1677,7 +1677,7 @@
|
|
FROM system_scene_package p
|
|
FROM system_scene_package p
|
|
JOIN system_user_scene u on p.id = u.package_id and u.is_deleted = '0' and p.is_deleted = '0'
|
|
JOIN system_user_scene u on p.id = u.package_id and u.is_deleted = '0' and p.is_deleted = '0'
|
|
JOIN system_scene_package_sublist s on p.id = s.scene_and_package
|
|
JOIN system_scene_package_sublist s on p.id = s.scene_and_package
|
|
- where scene_type='1' and s.is_deleted = '0' and user_id=#{userId} group by s.scene_name)qx join scene_natural zr on qx.scene_name=zr.natural_name) dd
|
|
|
|
|
|
+ where scene_type='1' and s.is_deleted = '0' and user_id=#{po.userId} group by s.scene_name)qx join scene_natural zr on qx.scene_name=zr.natural_name) dd
|
|
<where>
|
|
<where>
|
|
<if test="po.naturalName != null and po.naturalName != ''">
|
|
<if test="po.naturalName != null and po.naturalName != ''">
|
|
natural_name like CONCAT('%',#{po.naturalName,jdbcType=VARCHAR},'%')
|
|
natural_name like CONCAT('%',#{po.naturalName,jdbcType=VARCHAR},'%')
|
|
@@ -1966,7 +1966,7 @@
|
|
FROM system_scene_package p
|
|
FROM system_scene_package p
|
|
JOIN system_user_scene u on p.id = u.package_id and u.is_deleted = '0' and p.is_deleted = '0'
|
|
JOIN system_user_scene u on p.id = u.package_id and u.is_deleted = '0' and p.is_deleted = '0'
|
|
JOIN system_scene_package_sublist s on p.id = s.scene_and_package
|
|
JOIN system_scene_package_sublist s on p.id = s.scene_and_package
|
|
- where scene_type='1' and s.is_deleted = '0' and user_id=#{userId} group by s.scene_name)qx join scene_natural zr on qx.scene_name=zr.natural_name) ee
|
|
|
|
|
|
+ where scene_type='1' and s.is_deleted = '0' and user_id=#{poBq.userId} group by s.scene_name)qx join scene_natural zr on qx.scene_name=zr.natural_name) ee
|
|
<where>
|
|
<where>
|
|
<if test="poBq.naturalName != null and poBq.naturalName != ''">
|
|
<if test="poBq.naturalName != null and poBq.naturalName != ''">
|
|
or natural_name like CONCAT('%',#{poBq.naturalName,jdbcType=VARCHAR},'%')
|
|
or natural_name like CONCAT('%',#{poBq.naturalName,jdbcType=VARCHAR},'%')
|
|
@@ -2279,7 +2279,7 @@
|
|
FROM system_scene_package p
|
|
FROM system_scene_package p
|
|
JOIN system_user_scene u on p.id = u.package_id and u.is_deleted = '0' and p.is_deleted = '0'
|
|
JOIN system_user_scene u on p.id = u.package_id and u.is_deleted = '0' and p.is_deleted = '0'
|
|
JOIN system_scene_package_sublist s on p.id = s.scene_and_package
|
|
JOIN system_scene_package_sublist s on p.id = s.scene_and_package
|
|
- where scene_type='1' and s.is_deleted = '0' and user_id=#{userId} group by s.scene_name)qx join scene_natural zr on qx.scene_name=zr.natural_name) dd
|
|
|
|
|
|
+ where scene_type='1' and s.is_deleted = '0' and user_id=#{poBq.userId} group by s.scene_name)qx join scene_natural zr on qx.scene_name=zr.natural_name) dd
|
|
<where>
|
|
<where>
|
|
<if test="poBq.naturalName != null and poBq.naturalName != ''">
|
|
<if test="poBq.naturalName != null and poBq.naturalName != ''">
|
|
natural_name like CONCAT('%',#{poBq.naturalName,jdbcType=VARCHAR},'%')
|
|
natural_name like CONCAT('%',#{poBq.naturalName,jdbcType=VARCHAR},'%')
|