Merge remote-tracking branch 'origin/master'

admin

2019-03-14 eed607d87b2eee1f09b4a28da614f3ad0b46601d

 fanli/src/main/java/com/yeshi/fanli/controller/admin/HotSearchAdminController.java

@@ -13,10 +13,10 @@
import com.google.gson.reflect.TypeToken;

import com.yeshi.fanli.entity.bus.search.HotSearch;

import com.yeshi.fanli.entity.bus.su.search.SuperHotSearch;

import com.yeshi.fanli.entity.system.System;

import com.yeshi.fanli.entity.system.BusinessSystem;

import com.yeshi.fanli.service.inter.config.BusinessSystemService;

import com.yeshi.fanli.service.inter.config.HotSearchService;

import com.yeshi.fanli.service.inter.config.SuperHotSearchService;

import com.yeshi.fanli.service.inter.config.SystemService;

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

@@ -31,7 +31,7 @@
   private HotSearchService hotSearchService;

   

   @Resource

   private SystemService systemService;

   private BusinessSystemService businessSystemService;

   

   @Resource

   private SuperHotSearchService superHotSearchService;

@@ -178,7 +178,7 @@
      }

      

      try {

         System system = systemService.getById(systemId);

         BusinessSystem system = businessSystemService.getById(systemId);

         List<SuperHotSearch> list = superHotSearchService.getHotSearchSystem(id, systemId);

         if (list == null || list.size() == 0) {

            superHotSearchService.addSuper(id, system);