Bladeren bron

Merge remote-tracking branch 'origin/developerB' into developerB

zhijiezhao 3 jaren geleden
bovenliggende
commit
89abf87f2f
2 gewijzigde bestanden met toevoegingen van 0 en 8 verwijderingen
  1. 0 1
      src/main/resources/mapper/PageMapper.xml
  2. 0 7
      src/main/resources/mapper/SearchMapper.xml

+ 0 - 1
src/main/resources/mapper/PageMapper.xml

@@ -294,7 +294,6 @@
 		select
             id,
             navigationName as name,
-            type,
             link,
             icon,
             sort

+ 0 - 7
src/main/resources/mapper/SearchMapper.xml

@@ -24,8 +24,6 @@
         s.name as p_category2_name,
         p.tinyTypeID as p_category3_id,
         t.name as p_category3_name,
-        p.classifyId as p_classify_id,
-        c.classifyName as p_classify_name,
         p.preferredFlag as p_preferred,
         p.productCategory as p_type,
         p.validFlag as p_valid,
@@ -37,7 +35,6 @@
         left join tinytype as t on p.tinyTypeID = t.tinyTypeID
         left join smalltype as s on p.smallTypeID = s.smallTypeID
         left join bigtype as b on p.bigTypeID = b.bigTypeID
-        left join cm_products_classify as c on p.classifyId = c.id
         left join cm_brand as br on p.brandID = br.id
         left join shop as sh on p.shopID = sh.shopID
     </sql>
@@ -164,7 +161,6 @@
         <include refid="Supplier_Joins"/>
         where (status = 90 or status = 9)
         and shopID != 1252
-        order by s.sortIndex
     </select>
     <select id="searchSupplierById" resultType="com.caimei365.commodity.model.search.SupplierDO">
         select
@@ -329,9 +325,6 @@
         <if test="tinyTypeId != null and tinyTypeId != ''">
             and p.tinyTypeID = #{tinyTypeId}
         </if>
-        <if test="classifyId != null and classifyId != ''">
-            and p.classifyId = #{classifyId}
-        </if>
         <if test="keyword != null and keyword != ''">
             and p.name like concat('%',#{keyword},'%')
         </if>