bugfix

src/main/java/com/caimei/www/controller/unlimited/EncyclopediaController.java

@@ -57,10 +57,21 @@ public class EncyclopediaController extends BaseController {
         SimpleDateFormat sl=new SimpleDateFormat("yyyy-MM-dd");
         List<BaikeProductVo> authUserList = productService.getAuthUserList(typeId);
         if(null!=authUserList&&authUserList.size()>0){
+            for(BaikeProductVo baikeProductVo:authUserList){
+                //初始化基础浏览量（防止报错）
+                if(null!=baikeProductVo&&null==baikeProductVo.getPv()){
+                    //如果浏览量为空 则设置为0
+                    productService.initializationPV(baikeProductVo.getProductId());
+                }
+            }
         for (BaikeProductVo baikeProductVo:authUserList) {
                 if(null!=baikeProductVo.getPublishTime()){
                     baikeProductVo.setPublishTimeStr(sl.format(baikeProductVo.getPublishTime()));
                 }
+            if(null!=baikeProductVo&&null!=baikeProductVo.getPublishSource()&&baikeProductVo.getPublishSource()==1){
+                //供应商发布的词条取实际浏览量，管理员发布的取基础浏览量加实际浏览量
+                baikeProductVo.setPv(baikeProductVo.getPv()+baikeProductVo.getBasePv());
+            }
         }
         }
         //分类集合
@@ -82,17 +93,15 @@ public class EncyclopediaController extends BaseController {
     @GetMapping("/detail-{id}.html")
     public String getEncyclopediaDetail(final Model model, @PathVariable("id") Integer id) {
         SimpleDateFormat sl=new SimpleDateFormat("yyyy-MM-dd");
+            //初始化基础浏览量（防止报错）
+            //如果浏览量为空 则设置为0
+            productService.initializationPV(id);
         BaikeProductVo baikeproduct = productService.getEncyclopediaDetail(id);
         if(null!=baikeproduct){
             if(null!=baikeproduct.getPublishTime()){
                 baikeproduct.setPublishTimeStr(sl.format(baikeproduct.getPublishTime()));
             }
         }
-        //初始化基础浏览量（防止报错）
-        if(null!=baikeproduct&&null==baikeproduct.getPv()){
-            //如果浏览量为空 则设置为0
-            productService.initializationPV(id);
-        }
         if(null!=baikeproduct&&null!=baikeproduct.getPublishSource()&&baikeproduct.getPublishSource()==1){
             //供应商发布的词条取实际浏览量，管理员发布的取基础浏览量加实际浏览量
             baikeproduct.setPv(baikeproduct.getPv()+baikeproduct.getBasePv());

src/main/java/com/caimei/www/service/page/impl/ProductServiceImpl.java

@@ -402,6 +402,12 @@ public class ProductServiceImpl implements ProductService {
     public BaikeProductVo getEncyclopediaDetail(Integer id){
         //获取词条基本信息
         BaikeProductVo entryInfo = baikeDao.getEntryInfoById(id);
+        if(entryInfo!=null&&null!=entryInfo.getPublishTime()){
+            //格式化发布时间
+            SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd");
+            String publishTimeStr=dateFormat.format(entryInfo.getPublishTime());
+            entryInfo.setPublishTimeStr(publishTimeStr);
+        }
         //概述图册
         List<BaikeImageVo>  imageListById = baikeDao.getImageListById(id);
         if(null!=imageListById&&imageListById.size()>0){

src/main/resources/mapper/BaikeMapper.xml

@@ -110,6 +110,7 @@
 		p.actualPv as pv,
 		p.publishTime,
 		p.typeId,
+		p.basePv,
 		p.image
 		from cm_baike_product p
 		left join cm_baike_type t on p.typeId=t.id
@@ -130,6 +131,7 @@
 			p.addTime,
 			p.addBy
 		from cm_baike_hot_search p
+        order by sort , addTime desc
 	</select>
 
 	<select id="getEntryInfoById" resultType="com.caimei.www.pojo.baike.BaikeProductVo">
@@ -208,7 +210,7 @@
 
 	<select id="geTypeList"  resultType="com.caimei.www.pojo.baike.BaikeTypeVo">
 		select  id as typeId,name,pcBanner,appBanner,bannerLink from cm_baike_type
-		where status=1
+		where status=1 order by sort,addTime desc
 	</select>
 
 	<select id="geTypeListByid"  resultType="com.caimei.www.pojo.baike.BaikeTypeVo">