|
@@ -827,6 +827,7 @@
|
|
|
</foreach>
|
|
|
</if>
|
|
|
</where>
|
|
|
+ order by p.sortIndex desc
|
|
|
</select>
|
|
|
|
|
|
<select id="getNewFloor" resultType="com.caimei365.commodity.model.vo.ProductItemVo">
|
|
@@ -887,7 +888,12 @@
|
|
|
<select id="getNewFloorBrand" resultType="com.caimei365.commodity.model.vo.BrandVo">
|
|
|
SELECT DISTINCT s.`id`,s.`name` FROM product a
|
|
|
LEFT JOIN `cm_brand` s ON s.id = a.brandID
|
|
|
- WHERE a.newvalidFlag = 1
|
|
|
+ AND a.newvalidFlag = 1
|
|
|
+ AND a.newProductType=1
|
|
|
+ AND a.validFlag = 2
|
|
|
+ AND a.showFlag!=2
|
|
|
+ AND s.id IS NOT NULL
|
|
|
+ AND s.name IS NOT NULL
|
|
|
AND s.id IS NOT NULL
|
|
|
AND s.name IS NOT NULL
|
|
|
|