|
|
@@ -97,13 +97,19 @@
|
|
|
kl_concept unique_con
|
|
|
WHERE
|
|
|
lis.is_deleted = 'N'
|
|
|
- AND meal_con.is_deleted = 'N'
|
|
|
- AND unique_con.is_deleted = 'N'
|
|
|
+ <if test="mealIsDeleted != null and mealIsDeleted != ''">
|
|
|
+ AND meal_con.is_deleted = #{mealIsDeleted}
|
|
|
+ </if>
|
|
|
+ <if test="uniqueIsDeleted != null and uniqueIsDeleted != ''">
|
|
|
+ AND unique_con.is_deleted = #{uniqueIsDeleted}
|
|
|
+ </if>
|
|
|
AND lis.meal_id = meal_con.id
|
|
|
AND lis.unique_id = unique_con.id
|
|
|
) lis_mapping
|
|
|
LEFT JOIN kl_concept item_con ON lis_mapping.item_id = item_con.id
|
|
|
- AND item_con.is_deleted = 'N'
|
|
|
+ <if test="itemIsDeleted != null and itemIsDeleted != ''">
|
|
|
+ AND item_con.is_deleted = #{itemIsDeleted}
|
|
|
+ </if>
|
|
|
WHERE 1=1
|
|
|
<if test="mealNames != null and mealNames.size() > 0 ">
|
|
|
and lis_mapping.meal_name in
|
zhaops