瀏覽代碼

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

# Conflicts:
#	src/main/resources/mapper/BaseMapper.xml
zhijiezhao 2 年之前
父節點
當前提交
1a057a7c12
共有 1 個文件被更改,包括 4 次插入3 次删除
  1. 4 3
      src/main/resources/mapper/BaseMapper.xml

+ 4 - 3
src/main/resources/mapper/BaseMapper.xml

@@ -137,7 +137,7 @@
     </select>
 
     <select id="findKeywordId" resultType="com.caimei365.tools.model.po.SearchFrequencyVo">
-        select id, frequency, recommendStatus
+        select id,frequency,recommendStatus
         from cm_user_search_frequency
         where keyword = #{keyword}
           and delStatus = 1
@@ -206,9 +206,10 @@
 
     <update id="updateKeywordRecommend">
         UPDATE cm_user_search_frequency
-        SET frequency       = frequency + 1,
+        SET frequency  = frequency + 1,
             recommendStatus = 1,
-            searchtime      = NOW()
+            recommendTime = now(),
+            searchtime = NOW()
         WHERE id = #{id}
     </update>