Merge branch 'dev' of http://www.ekexiu.com:3000/jiapeng/portal-web.git

into dev

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

@@ -120,13 +120,13 @@ public abstract class ArticleDao {
	@LimitSelect
	@Exclude("articleContent")
	@OrderBy(cols = {@LimitColumn(value = "publishTime", asc = false), @LimitColumn(value = "shareId", handlerClass = LongHandler.class)}, value = "")
	@OrderBy(cols = {@LimitColumn(value = "publishTime", asc = false), @LimitColumn(value = "shareId",asc = false, handlerClass = LongHandler.class)}, value = "")
	@Where("STATUS = '1'")
	public abstract List<Article> proPublish(Connection con, String professorId, String publishTime, long shareId, int rows)throws SQLException;
	@LimitSelect
	@Exclude("articleContent")
	@OrderBy(cols = {@LimitColumn(value = "publishTime", asc = false), @LimitColumn(value = "shareId", handlerClass = LongHandler.class)}, value = "")
	@OrderBy(cols = {@LimitColumn(value = "publishTime", asc = false), @LimitColumn(value = "shareId",asc = false, handlerClass = LongHandler.class)}, value = "")
	@Where("STATUS = '1'")
	public abstract List<Article> orgPublish(Connection con, String orgId, String publishTime, long shareId, int rows)throws SQLException;

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

@@ -23,7 +23,6 @@ import org.jfw.apt.orm.annotation.dao.method.operator.Update;
import org.jfw.apt.orm.annotation.dao.method.operator.UpdateWith;
import org.jfw.apt.orm.annotation.dao.param.GroupSqlColumn;
import org.jfw.apt.orm.annotation.dao.param.In;
import org.jfw.apt.orm.annotation.dao.param.LessThan;
import org.jfw.apt.orm.annotation.dao.param.Like;
import org.jfw.apt.orm.annotation.dao.param.Set;
import org.jfw.apt.orm.core.defaultImpl.LongHandler;
@@ -1101,12 +1100,12 @@ public abstract class ResourceDao {
	public abstract PageQueryResult<Resource> pageQueryProPublish(Connection con,String professorId,int pageSize,int pageNo) throws SQLException;
    @LimitSelect
    @OrderBy(cols = {@LimitColumn(value = "publishTime", asc = false), @LimitColumn(value = "shareId", handlerClass = LongHandler.class)}, value = "")
    @OrderBy(cols = {@LimitColumn(value = "publishTime", asc = false), @LimitColumn(value = "shareId",asc = false,handlerClass = LongHandler.class)}, value = "")
    @Where("STATUS='1'")
    public abstract List<Resource> proPublish(Connection con, String professorId, String publishTime, long shareId, int rows) throws SQLException;
    @LimitSelect
    @OrderBy(cols = {@LimitColumn(value = "publishTime", asc = false), @LimitColumn(value = "shareId", handlerClass = LongHandler.class)}, value = "")
    @OrderBy(cols = {@LimitColumn(value = "publishTime", asc = false), @LimitColumn(value = "shareId",asc = false, handlerClass = LongHandler.class)}, value = "")
    @Where("STATUS='1'")
    public abstract List<Resource> orgPublish(Connection con, String orgId, String publishTime, long shareId, int rows) throws SQLException;

src/main/java/com/ekexiu/portal/service/ArticleService.java

@@ -54,6 +54,7 @@ import java.text.SimpleDateFormat;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@Path("/article")
public class ArticleService {
@@ -888,9 +889,9 @@ public class ArticleService {
	@Get
	@Path("/publish")
	public List<Article> proPublish(@JdbcConn Connection con, String category, String owner, @DefaultValue("\"9\"") String publishTime,@DefaultValue("Long.MAX_VALUE")long shareId, int rows)throws SQLException {
		if (category == "1") {
		if (Objects.equals(category, "1")) {
			return this.articleDao.proPublish(con, owner, publishTime,shareId, rows);
		} else if (category == "2") {
		} else if (Objects.equals(category, "2")) {
			return this.articleDao.orgPublish(con, owner, publishTime,shareId, rows);
		}
		return null;