111

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

@@ -165,7 +165,7 @@ public abstract class ArticleDao {
	public abstract PageQueryResult<Article> publishInPlatform(Connection con,
			@SqlColumn(handlerClass = StringHandler.class, value = { "ARTICLE_ID IN (SELECT AID FROM REFERENCED_ARTICLE WHERE PID=? )" }) String pid,
			@Nullable @GroupSqlColumn(handlerClass = StringHandler.class, value = { "ARTICLE_TITLE LIKE ?",
					"OWNER_ID IN (SELECT ID FROM ORGANIZATION WHERE NAME LIKE ? OR FOR_SHORT LIKE)" }, additional = 1, isAnd = false) String key,
					"OWNER_ID IN (SELECT ID FROM ORGANIZATION WHERE NAME LIKE ? OR FOR_SHORT LIKE ?)" }, additional = 1, isAnd = false) String key,
			int pageSize, int pageNo) throws SQLException;
	@PageSelect
@@ -176,7 +176,7 @@ public abstract class ArticleDao {
			@GroupSqlColumn(handlerClass = StringHandler.class, value = { "ARTICLE_ID NOT IN (SELECT AID FROM REFERENCED_ARTICLE WHERE PID=?)",
					"ARTICLE_TYPE='2' AND OWNER_ID IN (SELECT OID FROM RESIDENT_ORG WHERE PID=?)" }, isAnd = true) String pid,
			@Nullable @GroupSqlColumn(handlerClass = StringHandler.class, value = { "ARTICLE_TITLE LIKE ?",
					"OWNER_ID IN (SELECT ID FROM ORGANIZATION WHERE NAME LIKE ? OR FOR_SHORT LIKE)" }, additional = 1, isAnd = false) String key,
					"OWNER_ID IN (SELECT ID FROM ORGANIZATION WHERE NAME LIKE ? OR FOR_SHORT LIKE ?)" }, additional = 1, isAnd = false) String key,
			int pageSize, int pageNo) throws SQLException;
	@Exclude("articleContent")

src/main/java/com/ekexiu/portal/platform/PlatformService.java

@@ -457,14 +457,14 @@ public class PlatformService {
	@Path("/info/wares")
	public List<PlatformWare> queryWares(@JdbcConn Connection con, @Nullable String key, @DefaultValue("\"z\"") String time,
			@DefaultValue("Long.MAX_VALUE") long shareId, String pid, int rows) throws SQLException {
		return platformDao.queryWare(con, key, pid, time, shareId, rows);
		return platformDao.queryWare(con, key == null ? null : ("%" + key + "%"), pid, time, shareId, rows);
	}
	@Get
	@Path("/info/resources")
	public List<PlatformResource> queryResources(@JdbcConn Connection con, @Nullable String key, @DefaultValue("\"z\"") String time,
			@DefaultValue("Long.MAX_VALUE") long shareId, String pid, int rows) throws SQLException {
		return platformDao.queryResource(con, key, pid, time, shareId, rows);
		return platformDao.queryResource(con, key == null ? null : ("%" + key + "%"), pid, time, shareId, rows);
	}
	@Get

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

@@ -896,13 +896,13 @@ public class ArticleService {
	@Get
	@Path("/pgPublishInPlatform")
	public PageQueryResult<Article> pgPublishInPlatform(@JdbcConn Connection con,String pid,@Nullable String key,@DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo)throws SQLException {
			return this.articleDao.publishInPlatform(con,pid,key,pageSize,pageNo);
			return this.articleDao.publishInPlatform(con,pid, key == null ? null : ("%" + key + "%"),pageSize,pageNo);
	}
	
	@Get
	@Path("/pgPublishNotInPlatform")
	public PageQueryResult<Article> pgPublishNotInPlatform(@JdbcConn Connection con,String pid,@Nullable String key,@DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo)throws SQLException {
			return this.articleDao.publishNotInPlatform(con,pid,key,pageSize,pageNo);
			return this.articleDao.publishNotInPlatform(con,pid, key == null ? null : ("%" + key + "%"), pageSize,pageNo);
	}
	@Get