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

src/main/resources/mapper/KeyWordDao.xml

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