111

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

@@ -1092,12 +1092,14 @@ 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 = "")
    @Where("STATUS='1'")
    public abstract List<Resource> proPublish(Connection con, String professorId, @LessThan String publishTime, int rows) throws SQLException;
    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 = "")
    @Where("STATUS='1'")
    public abstract List<Resource> orgPublish(Connection con, String orgId, @LessThan String publishTime, int rows) throws SQLException;
    public abstract List<Resource> orgPublish(Connection con, String orgId, String publishTime, long shareId, int rows) throws SQLException;
	@SelectList
	@OrderBy("ORDER BY PUBLISH_TIME DESC")

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

@@ -126,7 +126,7 @@ public class PpaperService {
		} else {
			name = "%" + name + "%";
		}
		return this.ppaperDao.queryProfessor(con, id, name, assTime, id,rows);
		return this.ppaperDao.queryProfessor(con, owner, name, assTime, id,rows);
	}
	@Get

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

@@ -132,7 +132,7 @@ public class PpatentServcie {
		} else {
			name = "%" + name + "%";
		}
		return this.ppatentDao.queryProfessor(con, id, name, assTime, id,rows);
		return this.ppatentDao.queryProfessor(con, owner, name, assTime, id,rows);
	}
	@Get

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

@@ -830,13 +830,21 @@ public class ResourceService {
	@Get
	@Path("/publish")
	List<Resource> queryPublish(@JdbcConn Connection con, String category, String owner, @DefaultValue("\"9\"") String publishTime, int rows) throws SQLException {
	List<Resource> queryPublish(@JdbcConn Connection con, String category, String owner, @DefaultValue("\"9\"") String publishTime,@DefaultValue("Long.MAX_VALUE")long shareId, int rows) throws SQLException {
		List<Resource> resources = null;
		if (Objects.equals(category, "1")) {
			return this.resourceDao.proPublish(con, owner, publishTime, rows);
			resources = this.resourceDao.proPublish(con, owner, publishTime,shareId, rows);
		} else if (Objects.equals(category, "2")) {
			return this.resourceDao.orgPublish(con, owner, publishTime, rows);
			resources = this.resourceDao.orgPublish(con, owner, publishTime,shareId, rows);
		}
		if (resources != null && resources.size() > 0) {
			for (Resource resource : resources) {
				resource.setImages(this.imageDao.queryRes(con, resource.getResourceId()));
			}
			return resources;
		} else {
			return null;
		}
		return null;
	}
	@Get