--update queryFindHot();

src/main/java/com/ekexiu/portal/dao/ArticleDao.java

@@ -839,10 +839,10 @@ public abstract class ArticleDao {
        boolean firstPage = (1 == pageNo);
        if(firstPage){
        	queryResult.setPageNo(1);
        	sql = "(SELECT ARTICLE_ID,ARTICLE_TITLE,ARTICLE_IMG,ARTICLE_TYPE,CREATE_TIME,ORG_ID,PROFESSOR_ID FROM ARTICLE WHERE STATUS = '1')"
        	sql = "(SELECT ARTICLE_ID,ARTICLE_TITLE,ARTICLE_IMG,ARTICLE_TYPE,PUBLISH_TIME,ORG_ID,PROFESSOR_ID FROM ARTICLE WHERE STATUS = '1')"
                + " UNION ALL (SELECT RESOURCE_ID,RESOURCE_NAME,NULL,CASE WHEN RESOURCE_TYPE = '1' THEN '3' WHEN RESOURCE_TYPE = '2' THEN '4' ELSE NULL END,"
                + " CREATE_TIME,ORG_ID,PROFESSOR_ID FROM RESOURCE WHERE STATUS = '1')";
            sql = sql + " ORDER BY CREATE_TIME DESC ";
                + " PUBLISH_TIME,ORG_ID,PROFESSOR_ID FROM RESOURCE WHERE STATUS = '1')";
            sql = sql + " ORDER BY PUBLISH_TIME DESC ";
            sql = sql + " LIMIT " + pageSize;
        }else{
            int pageNum = total / pageSize;
@@ -855,10 +855,10 @@ public abstract class ArticleDao {
            queryResult.setPageNo(pageNo);
            --pageNo;
            int offset = (pageNo * pageSize);
            sql = "(SELECT ARTICLE_ID,ARTICLE_TITLE,ARTICLE_IMG,ARTICLE_TYPE,CREATE_TIME,ORG_ID,PROFESSOR_ID FROM ARTICLE WHERE STATUS = '1')"
            sql = "(SELECT ARTICLE_ID,ARTICLE_TITLE,ARTICLE_IMG,ARTICLE_TYPE,PUBLISH_TIME,ORG_ID,PROFESSOR_ID FROM ARTICLE WHERE STATUS = '1')"
                + " UNION ALL (SELECT RESOURCE_ID,RESOURCE_NAME,NULL,CASE WHEN RESOURCE_TYPE = '1' THEN '3' WHEN RESOURCE_TYPE = '2' THEN '4' ELSE NULL END,"
                + " CREATE_TIME,ORG_ID,PROFESSOR_ID FROM RESOURCE WHERE STATUS = '1')";
            sql = sql + " ORDER BY CREATE_TIME DESC ";
                + " PUBLISH_TIME,ORG_ID,PROFESSOR_ID FROM RESOURCE WHERE STATUS = '1')";
            sql = sql + " ORDER BY PUBLISH_TIME DESC ";
            sql = sql + " LIMIT " + pageSize+ " OFFSET " + offset;
        }
        ps = con.prepareStatement(sql);
@@ -879,7 +879,11 @@ public abstract class ArticleDao {
                    }
                    findInfo.setImage(image);
                    findInfo.setType(rs.getString(4));
                    findInfo.setCreateTime(rs.getString(5));
                    String createTime = rs.getString(5);
                    if(rs.wasNull()){
                    	createTime = null;
                    }
                    findInfo.setCreateTime(createTime);
                    String orgId = rs.getString(6);
                    if(rs.wasNull()){
                    	findInfo.setOwner(rs.getString(7));