|
|
@@ -193,7 +193,11 @@ public interface FsStoreProductScrmMapper
|
|
|
"<if test = 'maps.isStores != null and maps.isStores == 1 '>"+
|
|
|
"inner join fs_store_scrm fs on fs.store_id = p.store_id and fs.is_audit = 1 " +
|
|
|
"</if>" +
|
|
|
- "where p.is_del=0 and p.is_show=1 and p.is_audit = '1'" +
|
|
|
+ "where p.is_del=0 and p.is_show=1 " +
|
|
|
+ // 改为可选审核条件,如果不需要审核就不加这个条件
|
|
|
+ "<if test = 'maps.isStores != null and maps.isStores == 1'>" +
|
|
|
+ "and p.is_audit = '1'" +
|
|
|
+ "</if>" +
|
|
|
"<if test = 'maps.productName != null and maps.productName !=\"\" '> " +
|
|
|
"and (p.product_name like CONCAT('%',#{maps.productName},'%') or p.keyword like concat('%',#{maps.productName},'%') ) " +
|
|
|
"</if>" +
|
|
|
@@ -230,7 +234,6 @@ public interface FsStoreProductScrmMapper
|
|
|
"<if test = 'maps.salesOrder != null and maps.salesOrder==\"asc\" '> " +
|
|
|
"order by p.sales asc " +
|
|
|
"</if>" +
|
|
|
-
|
|
|
"<if test = 'maps.newOrder != null and maps.newOrder==\"desc\" '> " +
|
|
|
"and p.is_new =1 order by p.create_time desc " +
|
|
|
"</if>" +
|