浏览代码

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

huangzhiguo 1 年之前
父节点
当前提交
9466248404
共有 1 个文件被更改,包括 4 次插入1 次删除
  1. 4 1
      src/main/resources/mapper/KeyWordDao.xml

+ 4 - 1
src/main/resources/mapper/KeyWordDao.xml

@@ -66,13 +66,16 @@
         <if test="labelStatus == 1">
         <if test="labelStatus == 1">
             AND cusf.dynamicStatus = 0
             AND cusf.dynamicStatus = 0
         </if>
         </if>
+        <if test="labelStatus == null">
+            AND (cusf.dynamicStatus not in (0, 1) or (cusf.dynamicStatus IS NULL))
+        </if>
         <if test="labelStatus !=null">
         <if test="labelStatus !=null">
             AND cusf.trueStatus = #{labelStatus}
             AND cusf.trueStatus = #{labelStatus}
         </if>
         </if>
         <if test="fromSearch != null">
         <if test="fromSearch != null">
             AND cusf.fromSearch = #{fromSearch}
             AND cusf.fromSearch = #{fromSearch}
         </if>
         </if>
-        ORDER BY cusf.addTime DESC, cusf.searchTime DESC
+        ORDER BY cusf.frequency DESC, cusf.searchTime DESC
     </select>
     </select>
 
 
     <select id="findRecommendList" resultType="com.caimei365.manager.entity.caimei.KeyWord">
     <select id="findRecommendList" resultType="com.caimei365.manager.entity.caimei.KeyWord">