11

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

@@ -218,13 +218,13 @@ public abstract class OrgDao {
					"(ID IN (SELECT ORG_ID FROM ARTICLE WHERE ARTICLE_TYPE='2' AND ARTICLE_TITLE LIKE ?) AND IS_JOIN ='1')" }) String kw,
			int pageSize, int pageNo) throws SQLException;
	public List<EditOrganization> indexSearch(Connection con, String kw,long sortNum,String modifyTime,int rows)throws SQLException {
	public List<EditOrganization> indexSearch(Connection con, String kw,long sortNum,String modifyTime,String id,int rows)throws SQLException {
		int index = 1;
		StringBuilder sql = new StringBuilder();
		sql.append("SELECT FOR_SHORT,ORG_URL,FOUND_TIME,PROVINCE,CITY,SUBJECT,INDUSTRY,ORG_SIZE,QUALIFICATION,IS_JOIN,AUTH_STATUS,ADDR,EMAIL,CONTACT_NUM,FIELD_OF_CUSTOMER,FIELD_OF_SUPPLIER,SORT_NUM,PAGE_VIEWS,SHARE_ID,COL_MGR,RES_MGR,ORG_ATTR,ID,NAME,ORG_TYPE,CREATE_TIME,MODIFY_TIME,DESCP FROM ORGANIZATION");
		sql.append(" WHERE SORT_NUM < ? OR (SORT_NUM = ? AND MODIFY_TIME < ?) ");
		sql.append(" WHERE (SORT_NUM < ? OR (SORT_NUM = ? AND MODIFY_TIME < ?) OR (SORT_NUM = ? AND MODIFY_TIME = ? AND ID < ?)) ");
		if (kw != null) {
			sql.append(" AND (ID IN (SELECT ORG_ID FROM ARTICLE WHERE ARTICLE_TYPE='2' AND ARTICLE_TITLE LIKE ?) AND IS_JOIN ='1') OR (ID IN (SELECT ORG_ID FROM RESOURCE WHERE RESOURCE_TYPE='2' AND RESOURCE_NAME LIKE ?) AND IS_JOIN ='1') OR (industry LIKE ?  AND IS_JOIN ='1') OR (SUBJECT LIKE ? AND IS_JOIN ='1') OR (DESCP LIKE ?  AND IS_JOIN ='1') OR (FOR_SHORT LIKE ? AND IS_JOIN ='1') OR (NAME LIKE ? AND IS_JOIN ='1') ");
			sql.append(" AND ((ID IN (SELECT ORG_ID FROM ARTICLE WHERE ARTICLE_TYPE='2' AND ARTICLE_TITLE LIKE ?) AND IS_JOIN ='1') OR (ID IN (SELECT ORG_ID FROM RESOURCE WHERE RESOURCE_TYPE='2' AND RESOURCE_NAME LIKE ?) AND IS_JOIN ='1') OR (industry LIKE ?  AND IS_JOIN ='1') OR (SUBJECT LIKE ? AND IS_JOIN ='1') OR (DESCP LIKE ?  AND IS_JOIN ='1') OR (FOR_SHORT LIKE ? AND IS_JOIN ='1') OR (NAME LIKE ? AND IS_JOIN ='1')) ");
		}
		sql.append(" ORDER BY SORT_NUM DESC, MODIFY_TIME DESC LIMIT ? ");
		PreparedStatement ps = con.prepareStatement(sql.toString());
@@ -232,6 +232,9 @@ public abstract class OrgDao {
			ps.setLong(index++, sortNum);
			ps.setLong(index++, sortNum);
			ps.setString(index++, modifyTime);
			ps.setLong(index++, sortNum);
			ps.setString(index++, modifyTime);
			ps.setString(index++, id);
			if (kw != null) {
				ps.setString(index++, kw);
				ps.setString(index++, kw);

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

@@ -247,11 +247,11 @@ public class OrgService {
	@Get
	@Path("/index/search")
	public List<EditOrganization> indexSearch(@JdbcConn Connection con, @Nullable String key, @DefaultValue("Long.MAX_VALUE") long sortNum, @DefaultValue("\"9\"") String modifyTime, @DefaultValue("10000000") int rows)throws SQLException {
	public List<EditOrganization> indexSearch(@JdbcConn Connection con, @Nullable String key, @DefaultValue("Long.MAX_VALUE") long sortNum, @DefaultValue("\"9\"") String modifyTime,@DefaultValue("\"Z\"")String id, @DefaultValue("10000000") int rows)throws SQLException {
		if (key != null) {
			key = "%" + key + "%";
		}
		List<EditOrganization> orgs = this.orgDao.indexSearch(con,key,sortNum,modifyTime,rows);
		List<EditOrganization> orgs = this.orgDao.indexSearch(con,key,sortNum,modifyTime,id,rows);
		for (EditOrganization organization : orgs) {
			organization.setHasOrgLogo(this.imageService.hasOrgLogo(organization.getId()));
		}