bugfix

src/main/java/com/caimei/modules/product/dao/KeywordFrequencyDao.java

@@ -18,7 +18,7 @@ public interface KeywordFrequencyDao extends CrudDao<SearchFrequency> {
 
     List<SearchFrequency> getvalueListByIds(@Param("idList") int[] idList);
 
-    void delKeyWordById(@Param("id") Integer id);
+    void delKeyWordById(@Param("id") Integer id,@Param("delStatus") Integer delStatus);
 
     int insert(SearchFrequency searchFrequency);
 

src/main/java/com/caimei/modules/product/service/KeywordFrequencyService.java

@@ -70,8 +70,12 @@ public class KeywordFrequencyService extends CrudService<KeywordFrequencyDao, Se
      * @return
      */
     @Transactional(readOnly = false)
-    public String delKeyWordById(Integer id){
-        keywordFrequencyDao.delKeyWordById(id);
+    public String delKeyWordById(Integer id,Integer delStatus){
+        if(null!=delStatus&&delStatus==1){
+            keywordFrequencyDao.delKeyWordById(id,0);
+        }else{
+            keywordFrequencyDao.delKeyWordById(id,1);
+        }
         //删除缓存中的数据
         SearchFrequency keyById = keywordFrequencyDao.getKeyById(id);
         //根据key值获取数据，如果只有一条则直接删除，大于一条则删除后重新缓存

src/main/java/com/caimei/modules/product/web/KeywordFrequencyController.java

@@ -121,7 +121,7 @@ public class KeywordFrequencyController extends BaseController {
      */
     @RequestMapping("/delKeyWordById")
     public String delKeyWordById(Integer id,Integer status,RedirectAttributes redirectAttributes){
-        keywordFrequencyService.delKeyWordById(id);
+        keywordFrequencyService.delKeyWordById(id,status);
         addMessage(redirectAttributes, "删除关键词成功");
         if(status==1){
             return "redirect:"+Global.getAdminPath()+"/product/keywordFrequency/getKeyInfo";

src/main/resources/mappings/modules/product/SearchFrequencyMapper.xml

@@ -12,9 +12,12 @@
                     trueStatus,
                     delStatus
               from cm_user_search_frequency
-             where trueStatus=#{trueStatus} and delStatus=1
+             where  delStatus=1
+             <if test="trueStatus != null">
+                 AND trueStatus=#{trueStatus}
+             </if>
              <if test="keyword != null and keyword != ''">
-                 AND keyword = #{keyword}
+                 AND keyword like CONCAT('%',#{keyword},'%')
              </if>
              <if test="fromSearch != null">
                  AND fromSearch = #{fromSearch}
@@ -78,7 +81,13 @@
         </foreach>
     </select>
     <update id="delKeyWordById" parameterType="java.lang.Integer">
-        update cm_user_search_frequency set delStatus=0
+        update cm_user_search_frequency
+        <set>
+            trueStatus=0,
+        <if test="delStatus != null">
+            delStatus=#{delStatus}
+        </if>
+        </set>
         where id =#{id}
     </update>
     <insert id="insert" parameterType="com.caimei.modules.product.entity.SearchFrequency">

src/main/webapp/WEB-INF/views/modules/product/keywordFrequency.jsp

@@ -31,7 +31,7 @@
                 //几个参数需要注意一下
                 type: "get",//方法类型
                 dataType:"json",
-                url: "${ctx}/product/keywordFrequency/getSeacherFrom?trueStatus=0" ,//url
+                url: "${ctx}/product/keywordFrequency/getSeacherFrom" ,//url
                 success: function (data) {
                     $('#search').get(0).options.length = 0;
                     $('#search').append('<option value="" aria-selected="true">请选择</option>');