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

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

@@ -97,7 +97,7 @@ public abstract class ArticleDao {
	@DeleteWith
	@From(Article.class)
	public abstract int deletePro(Connection con, String professorId) throws SQLException;
	public abstract int deletePro(Connection con, String ownerId) throws SQLException;
	@Exclude("articleContent")
	@SelectList
@@ -107,19 +107,20 @@ public abstract class ArticleDao {
	@Exclude("articleContent")
	@SelectList
	@OrderBy(" ORDER BY MODIFY_TIME DESC ")
	public abstract List<Article> queryPro(Connection con, String professorId) throws SQLException;
	@Where("ARTICLE_TYPE = '1'")
	public abstract List<Article> queryPro(Connection con, String ownerId) throws SQLException;
	@Exclude("articleContent")
	@SelectList
	@OrderBy(" ORDER BY MODIFY_TIME DESC ")
	@Where("STATUS = '1'")
	public abstract List<Article> queryProPublish(Connection con, String professorId) throws SQLException;
	@Where("STATUS = '1' AND ARTICLE_TYPE = '1'")
	public abstract List<Article> queryProPublish(Connection con, String ownerId) throws SQLException;
	@Exclude("articleContent")
	@PageSelect
	@OrderBy(" ORDER BY PUBLISH_TIME DESC,SHARE_ID ASC")
	@Where("STATUS = '1'")
	public abstract PageQueryResult<Article> pageQueryProPublish(Connection con, String professorId, int pageSize, int pageNo) throws SQLException;
	@Where("STATUS = '1' AND ARTICLE_TYPE = '1'")
	public abstract PageQueryResult<Article> pageQueryProPublish(Connection con, String ownerId, int pageSize, int pageNo) throws SQLException;
	//@LimitSelect
	//@Exclude("articleContent")
@@ -137,35 +138,37 @@ public abstract class ArticleDao {
	@Exclude("articleContent")
	@OrderBy(cols = {@LimitColumn(value = "publishTime", asc = false), @LimitColumn(value = "shareId",asc = false, handlerClass = LongHandler.class)}, value = "")
	@Where("STATUS = '1'")
	public abstract List<Article> publish(Connection con,String articleType,@GroupSqlColumn(handlerClass = StringHandler.class,value ={"PROFESSOR_ID = ?","ORG_ID = ?"},isAnd = false) String owner, String publishTime, long shareId, int rows)throws SQLException;
	public abstract List<Article> publish(Connection con,String articleType, String ownerId, String publishTime, long shareId, int rows)throws SQLException;
	@Exclude("articleContent")
	@SelectList
	@OrderBy(" ORDER BY MODIFY_TIME DESC ")
	@Where("STATUS IN ('0','1','2')")
	public abstract List<Article> queryForDesk(Connection con, String professorId) throws SQLException;
	@Where("STATUS IN ('0','1','2') AND ARTICLE_TYPE = '1'")
	public abstract List<Article> queryForDesk(Connection con, String ownerId) throws SQLException;
	@Exclude("articleContent")
	@SelectList
	@OrderBy(" ORDER BY MODIFY_TIME DESC ")
	public abstract List<Article> queryOrg(Connection con, String orgId) throws SQLException;
	@Where("ARTICLE_TYPE = '2'")
	public abstract List<Article> queryOrg(Connection con, String ownerId) throws SQLException;
	@Exclude("articleContent")
	@SelectList
	@OrderBy(" ORDER BY MODIFY_TIME DESC ")
	@Where("STATUS = '1'")
	public abstract List<Article> queryOrgPublish(Connection con, String onergId) throws SQLException;
	@Where("STATUS = '1' AND ARTICLE_TYPE = '2'")
	public abstract List<Article> queryOrgPublish(Connection con, String ownenerId) throws SQLException;
	@Exclude("articleContent")
	@PageSelect
	@OrderBy(" ORDER BY PUBLISH_TIME DESC,SHARE_ID ASC")
	@Where("STATUS = '1'")
	public abstract PageQueryResult<Article> pageQueryOrgPublish(Connection con, String onergId, int pageSize, int pageNo) throws SQLException;
	@Where("STATUS = '1' AND ARTICLE_TYPE = '2'")
	public abstract PageQueryResult<Article> pageQueryOrgPublish(Connection con, String ownenerId, int pageSize, int pageNo) throws SQLException;
	@Exclude("articleContent")
	@LimitSelect
	@OrderBy(" ORDER BY MODIFY_TIME DESC ")
	public abstract List<Article> queryLimit(Connection con, String orgId, @LessThan String modifyTime, int rows) throws SQLException;
	@Where("ARTICLE_TYPE = '2'")
	public abstract List<Article> queryLimit(Connection con, String ownerId, @LessThan String modifyTime, int rows) throws SQLException;
	@SelectOne
	@Nullable
@@ -179,7 +182,7 @@ public abstract class ArticleDao {
		boolean hasArticleId = null != articleId;
		StringBuilder sql = new StringBuilder();
		sql.append(
				"SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,'',SUBJECT,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME,SHARE_ID,COL_NUM FROM ARTICLE");
				"SELECT ARTICLE_ID,OWNER_ID,ARTICLE_TITLE,'',SUBJECT,PUBLISH_TIME,ARTICLE_IMG,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME,SHARE_ID,COL_NUM FROM ARTICLE");
		sql.append(" WHERE STATUS = '1'");
		if (hasArticleId) {
			sql.append(" AND ARTICLE_ID != ?");
@@ -201,7 +204,7 @@ public abstract class ArticleDao {
					if (rs.wasNull()) {
						proId = null;
					}
					article.setProfessorId(proId);
					article.setOwnerId(proId);
					article.setArticleTitle(rs.getString(3));
					String articleContent = rs.getString(4);
					if (rs.wasNull()) {
@@ -223,27 +226,22 @@ public abstract class ArticleDao {
						articleImg = null;
					}
					article.setArticleImg(articleImg);
					String org = rs.getString(8);
					if (rs.wasNull()) {
						org = null;
					}
					article.setOrgId(org);
					String articleType = rs.getString(9);
					String articleType = rs.getString(8);
					if (rs.wasNull()) {
						articleType = null;
					}
					article.setArticleType(articleType);
					article.setArticleAgree(rs.getInt(10));
					article.setPageViews(rs.getInt(11));
					String status = rs.getString(12);
					article.setArticleAgree(rs.getInt(9));
					article.setPageViews(rs.getInt(10));
					String status = rs.getString(11);
					if (rs.wasNull()) {
						status = null;
					}
					article.setStatus(status);
					article.setCreateTime(rs.getString(13));
					article.setModifyTime(rs.getString(14));
					article.setShareId(rs.getLong(15));
					article.setColNum(rs.getInt(16));
					article.setCreateTime(rs.getString(12));
					article.setModifyTime(rs.getString(13));
					article.setShareId(rs.getLong(14));
					article.setColNum(rs.getInt(15));
					articles.add(article);
				}
				return articles;
@@ -261,20 +259,16 @@ public abstract class ArticleDao {
		}
	}
	public List<Article> queryByAuthor(Connection con, String professorId, String orgId, String articleId, int rows) throws SQLException {
	public List<Article> queryByAuthor(Connection con, String ownerId, String articleId, int rows) throws SQLException {
		int index = 1;
		boolean hasProId = null != professorId;
		boolean hasOrgId = null != orgId;
		boolean hasOwnerId = null != ownerId;
		boolean hasArticleId = null != articleId;
		StringBuilder sql = new StringBuilder();
		sql.append(
				"SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,'',SUBJECT,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME,SHARE_ID,COL_NUM FROM ARTICLE");
				"SELECT ARTICLE_ID,OWNER_ID,ARTICLE_TITLE,'',SUBJECT,PUBLISH_TIME,ARTICLE_IMG,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME,SHARE_ID,COL_NUM FROM ARTICLE");
		sql.append(" WHERE STATUS = '1'");
		if (hasProId) {
			sql.append(" AND PROFESSOR_ID = ?");
		}
		if (hasOrgId) {
			sql.append(" AND ORG_ID = ?");
		if (hasOwnerId) {
			sql.append(" AND OWNER_ID = ?");
		}
		if (hasArticleId) {
			sql.append(" AND ARTICLE_ID != ?");
@@ -283,11 +277,8 @@ public abstract class ArticleDao {
		sql.append(" LIMIT ").append(rows);
		PreparedStatement ps = con.prepareStatement(sql.toString());
		try {
			if (hasProId) {
				ps.setString(index++, professorId);
			}
			if (hasOrgId) {
				ps.setString(index++, orgId);
			if (hasOwnerId) {
				ps.setString(index++, ownerId);
			}
			if (hasArticleId) {
				ps.setString(index++, articleId);
@@ -302,7 +293,7 @@ public abstract class ArticleDao {
					if (rs.wasNull()) {
						proId = null;
					}
					article.setProfessorId(proId);
					article.setOwnerId(proId);
					article.setArticleTitle(rs.getString(3));
					String articleContent = rs.getString(4);
					if (rs.wasNull()) {
@@ -324,27 +315,22 @@ public abstract class ArticleDao {
						articleImg = null;
					}
					article.setArticleImg(articleImg);
					String org = rs.getString(8);
					if (rs.wasNull()) {
						org = null;
					}
					article.setOrgId(org);
					String articleType = rs.getString(9);
					String articleType = rs.getString(8);
					if (rs.wasNull()) {
						articleType = null;
					}
					article.setArticleType(articleType);
					article.setArticleAgree(rs.getInt(10));
					article.setPageViews(rs.getInt(11));
					String status = rs.getString(12);
					article.setArticleAgree(rs.getInt(9));
					article.setPageViews(rs.getInt(10));
					String status = rs.getString(11);
					if (rs.wasNull()) {
						status = null;
					}
					article.setStatus(status);
					article.setCreateTime(rs.getString(13));
					article.setModifyTime(rs.getString(14));
					article.setShareId(rs.getLong(15));
					article.setColNum(rs.getInt(16));
					article.setCreateTime(rs.getString(12));
					article.setModifyTime(rs.getString(13));
					article.setShareId(rs.getLong(14));
					article.setColNum(rs.getInt(15));
					articles.add(article);
				}
				return articles;
@@ -511,8 +497,8 @@ public abstract class ArticleDao {
	@OrderBy(" ORDER BY SORT_NUM DESC, PUBLISH_TIME DESC")
	@Where("STATUS = '1'")
	public abstract PageQueryResult<Article> firstPageQuery(Connection con,
			@GroupSqlColumn(isAnd = false, handlerClass = StringHandler.class, value = { "PROFESSOR_ID IN (SELECT ID FROM PROFESSOR WHERE NAME LIKE ?)",
					"ONERG_ID IN (SELECT ID FROM ORGANIZATION WHERE NAME LIKE ? OR FOR_SHORT LIKE ?) ", "ARTICLE_TITLE LIKE ?",
			@GroupSqlColumn(isAnd = false, handlerClass = StringHandler.class, value = { "OWNER_ID IN (SELECT ID FROM PROFESSOR WHERE NAME LIKE ?)",
					"OWNENER_ID IN (SELECT ID FROM ORGANIZATION WHERE NAME LIKE ? OR FOR_SHORT LIKE ?) ", "ARTICLE_TITLE LIKE ?",
					"SUBJECT LIKE ?" }, additional = 1) @Nullable String key,
			int pageSize, int pageNo) throws SQLException;
@@ -520,7 +506,7 @@ public abstract class ArticleDao {
	@Exclude("articleContent")
	@Where("STATUS = '1'")
	@OrderBy(cols = {@LimitColumn(value = "sortNum", asc = false, handlerClass = LongHandler.class), @LimitColumn(value = "publishTime", asc = false), @LimitColumn(value = "articleId", asc = false)}, value = "")
	public abstract List<Article> indexSearch(Connection con,@Nullable @GroupSqlColumn(handlerClass = StringHandler.class, value = {"PROFESSOR_ID IN (SELECT ID FROM PROFESSOR WHERE NAME LIKE ?)", "ONERG_ID IN (SELECT ID FROM ORGANIZATION WHERE NAME LIKE ? OR FOR_SHORT LIKE ?)", "ARTICLE_TITLE LIKE ?", "SUBJECT LIKE ?"}, additional = 1, isAnd = false) String key, long sortNum, String publishTime, String articleId, int rows) throws SQLException;
	public abstract List<Article> indexSearch(Connection con,@Nullable @GroupSqlColumn(handlerClass = StringHandler.class, value = {"OWNER_ID IN (SELECT ID FROM PROFESSOR WHERE NAME LIKE ?)", "OWNENER_ID IN (SELECT ID FROM ORGANIZATION WHERE NAME LIKE ? OR FOR_SHORT LIKE ?)", "ARTICLE_TITLE LIKE ?", "SUBJECT LIKE ?"}, additional = 1, isAnd = false) String key, long sortNum, String publishTime, String articleId, int rows) throws SQLException;
	// public PageQueryResult<Article> firstPageQuery(Connection con, String
	// key, int pageSize, int pageNo) throws SQLException {
@@ -696,7 +682,7 @@ public abstract class ArticleDao {
	@Exclude("articleContent")
	@OrderBy(" ORDER BY selfOrderField DESC,SHARE_ID ASC ")
	@Where("STATUS IN ('1','0','2')")
	public abstract PageQueryResult<SelfArticle> queryPageForSelf(Connection con, @Nullable String professorId, @Nullable String orgId,
	public abstract PageQueryResult<SelfArticle> queryPageForSelf(Connection con, @Nullable String ownerId,
			@Like @Nullable String articleTitle, int pageSize, int pageNo) throws SQLException;
	public PageQueryResult<FindInfo> queryPage(Connection con, int pageSize, int pageNo) throws SQLException {
@@ -732,7 +718,7 @@ 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"
			sql = "SELECT ARTICLE_ID,ARTICLE_TITLE,ARTICLE_IMG,ARTICLE_TYPE,CREATE_TIME,OWNER_ID FROM ARTICLE"
					+ " UNION ALL SELECT RESOURCE_ID,RESOURCE_NAME,NULL,'3',CREATE_TIME,NULL,PROFESSOR_ID FROM RESOURCE";
			sql = sql + " ORDER BY CREATE_TIME DESC ";
			sql = sql + " LIMIT " + pageSize;
@@ -747,7 +733,7 @@ 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"
			sql = "SELECT ARTICLE_ID,ARTICLE_TITLE,ARTICLE_IMG,ARTICLE_TYPE,CREATE_TIME,OWNER_ID FROM ARTICLE"
					+ " UNION ALL SELECT RESOURCE_ID,RESOURCE_NAME,NULL,'3',CREATE_TIME,NULL,PROFESSOR_ID FROM RESOURCE";
			sql = sql + " ORDER BY CREATE_TIME DESC ";
			sql = sql + " LIMIT " + pageSize + " OFFSET " + offset;
@@ -771,12 +757,8 @@ public abstract class ArticleDao {
					findInfo.setImage(image);
					findInfo.setType(rs.getString(4));
					findInfo.setCreateTime(rs.getString(5));
					String onergId = rs.getString(6);
					if (rs.wasNull()) {
						findInfo.setOwner(rs.getString(7));
					} else {
						findInfo.setOwner(orgId);
					}
					String ownenerId = rs.getString(6);
					findInfo.setOwner(ownerId);
					findInfos.add(findInfo);
				}
				return queryResult;
@@ -827,7 +809,7 @@ public abstract class ArticleDao {
		boolean firstPage = (1 == pageNo);
		if (firstPage) {
			queryResult.setPageNo(1);
			sql = "(SELECT ARTICLE_ID,ARTICLE_TITLE,ARTICLE_IMG,ARTICLE_TYPE,PUBLISH_TIME,ORG_ID,PROFESSOR_ID FROM ARTICLE WHERE STATUS = '1')"
			sql = "(SELECT ARTICLE_ID,ARTICLE_TITLE,ARTICLE_IMG,ARTICLE_TYPE,PUBLISH_TIME,OWNER_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,"
					+ " PUBLISH_TIME,ORG_ID,PROFESSOR_ID FROM RESOURCE WHERE STATUS = '1')";
			sql = sql + " ORDER BY PUBLISH_TIME DESC ";
@@ -843,7 +825,7 @@ public abstract class ArticleDao {
			queryResult.setPageNo(pageNo);
			--pageNo;
			int offset = (pageNo * pageSize);
			sql = "(SELECT ARTICLE_ID,ARTICLE_TITLE,ARTICLE_IMG,ARTICLE_TYPE,PUBLISH_TIME,ORG_ID,PROFESSOR_ID FROM ARTICLE WHERE STATUS = '1')"
			sql = "(SELECT ARTICLE_ID,ARTICLE_TITLE,ARTICLE_IMG,ARTICLE_TYPE,PUBLISH_TIME,OWNER_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,"
					+ " PUBLISH_TIME,ORG_ID,PROFESSOR_ID FROM RESOURCE WHERE STATUS = '1')";
			sql = sql + " ORDER BY PUBLISH_TIME DESC ";
@@ -872,12 +854,8 @@ public abstract class ArticleDao {
						createTime = null;
					}
					findInfo.setCreateTime(createTime);
					String onergId = rs.getString(6);
					if (rs.wasNull()) {
						findInfo.setOwner(rs.getString(7));
					} else {
						findInfo.setOwner(orgId);
					}
					String ownenerId = rs.getString(6);
					findInfo.setOwner(ownerId);
					findInfos.add(findInfo);
				}
				return queryResult;
@@ -921,6 +899,6 @@ public abstract class ArticleDao {
	@Where("STATUS = '1'")
	@Column(value = "COUNT(1)", handlerClass = LongHandler.class)
	@From(Article.class)
	public abstract long countPublish(Connection con, String articleType,@GroupSqlColumn(handlerClass = StringHandler.class,value = {"PROFESSOR_ID = ?","ORG_ID = ?"},isAnd = false) String owner) throws SQLException;
	public abstract long countPublish(Connection con, String articleType, String ownerId) throws SQLException;
}

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

@@ -217,7 +217,7 @@ public abstract class OrgDao {
			@SqlColumn(handlerClass = StringHandler.class, value = { "(NAME LIKE ? AND IS_JOIN ='1')", "(FOR_SHORT LIKE ? AND IS_JOIN ='1')",
					"(DESCP LIKE ?  AND IS_JOIN ='1')", "(SUBJECT LIKE ? AND IS_JOIN ='1') ", "(industry LIKE ?  AND IS_JOIN ='1')",
					"(ID IN (SELECT ORG_ID FROM RESOURCE WHERE RESOURCE_TYPE='2' AND RESOURCE_NAME LIKE ?) AND IS_JOIN ='1')",
					"(ID IN (SELECT ONERG_ID FROM ARTICLE WHERE ARTICLE_TYPE='2' AND ARTICLE_TITLE LIKE ?) AND IS_JOIN ='1')" }) String kw,
					"(ID IN (SELECT OWNENER_ID FROM ARTICLE WHERE ARTICLE_TYPE='2' AND ARTICLE_TITLE LIKE ?) AND IS_JOIN ='1')" }) String kw,
			int pageSize, int pageNo) throws SQLException;
	@LimitQuery
@@ -226,7 +226,7 @@ public abstract class OrgDao {
	@OrderBy(cols = {@LimitColumn(value = "sortNum", asc = false, handlerClass = LongHandler.class), @LimitColumn(value = "modifyTime", asc = false), @LimitColumn(value = "id", asc = false)}, value = "")
	public abstract List<EditOrganization> indexSearch(Connection con, @Nullable @GroupSqlColumn(handlerClass = StringHandler.class, value = {"NAME LIKE ? AND IS_JOIN ='1'", "FOR_SHORT LIKE ? AND IS_JOIN ='1'", "DESCP LIKE ?  AND IS_JOIN ='1'", "SUBJECT LIKE ? AND IS_JOIN ='1' ", "industry LIKE ?  AND IS_JOIN ='1'",
			"ID IN (SELECT ORG_ID FROM RESOURCE WHERE RESOURCE_TYPE='2' AND RESOURCE_NAME LIKE ?) AND IS_JOIN ='1'",
			"ID IN (SELECT ONERG_ID FROM ARTICLE WHERE ARTICLE_TYPE='2' AND ARTICLE_TITLE LIKE ?) AND IS_JOIN ='1'"},isAnd = false) String kw, long sortNum, String modifyTime, String id, int rows) throws SQLException;
			"ID IN (SELECT OWNENER_ID FROM ARTICLE WHERE ARTICLE_TYPE='2' AND ARTICLE_TITLE LIKE ?) AND IS_JOIN ='1'"},isAnd = false) String kw, long sortNum, String modifyTime, String id, int rows) throws SQLException;
	@PageQuery
	@Select(Organization.class)
@@ -236,7 +236,7 @@ public abstract class OrgDao {
			@GroupSqlColumn(isAnd=false, handlerClass = StringHandler.class, value = { "NAME LIKE ? AND IS_JOIN ='1'", "FOR_SHORT LIKE ? AND IS_JOIN ='1'",
					"DESCP LIKE ?  AND IS_JOIN ='1'", "SUBJECT LIKE ? AND IS_JOIN ='1' ", "industry LIKE ?  AND IS_JOIN ='1'",
					"ID IN (SELECT ORG_ID FROM RESOURCE WHERE RESOURCE_TYPE='2' AND RESOURCE_NAME LIKE ?) AND IS_JOIN ='1'",
					"ID IN (SELECT ONERG_ID FROM ARTICLE WHERE ARTICLE_TYPE='2' AND ARTICLE_TITLE LIKE ?) AND IS_JOIN ='1'" })
					"ID IN (SELECT OWNENER_ID FROM ARTICLE WHERE ARTICLE_TYPE='2' AND ARTICLE_TITLE LIKE ?) AND IS_JOIN ='1'" })
		@Nullable	String kw, @Nullable String industry,@Nullable String addr, int pageSize,
			int pageNo) throws SQLException;

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

@@ -1193,7 +1193,7 @@ public abstract class ProfessorDao {
					+ " OR (ORG_ID IN(SELECT ORGANIZATION.ID FROM ORGANIZATION WHERE ORGANIZATION.NAME LIKE ?)) "
					+ " OR ( P.NAME LIKE ?) OR (P.SUBJECT LIKE ?) OR (P.INDUSTRY LIKE ?) OR (P.PROVINCE LIKE ?) OR (P.ADDRESS LIKE ?) "
					+ " OR P.ID IN (SELECT PROFESSOR_ID FROM RESOURCE WHERE RESOURCE_NAME LIKE ?) "
					+ " OR P.ID IN (SELECT PROFESSOR_ID FROM ARTICLE WHERE ARTICLE_TITLE LIKE ?) "
					+ " OR P.ID IN (SELECT OWNER_ID FROM ARTICLE WHERE ARTICLE_TYPE='1' AND ARTICLE_TITLE LIKE ?) "
					+ " OR (P.ID IN (SELECT PROFESSOR_ID FROM PATENT WHERE NAME LIKE ?)) OR (P.DEPARTMENT LIKE ?))");
		}
		boolean hasSubject = null != subject;
@@ -1397,7 +1397,7 @@ public abstract class ProfessorDao {
	@OrderBy("ORDER BY sort_desc DESC ")
	public abstract List<SortedPro> indexSearch(Connection con,
											  @SqlColumn(handlerClass = StringHandler.class, value = {"(case when sort_first=0 then '00000' else TO_CHAR(sort_first,'00009') end || TO_CHAR(CEIL(star_level * 100),'0009') || p.id )< ? "}) String sortDesc, @Nullable @GroupSqlColumn(value = {
			"P.NAME LIKE ?", "O.NAME LIKE ?", "P.DEPARTMENT LIKE ?", "P.DESCP LIKE ?", "P.SUBJECT LIKE ?", "P.INDUSTRY LIKE ?", "P.ID IN (SELECT DISTINCT PROFESSOR_ID FROM RESEARCH_AREA WHERE CAPTION LIKE ?)", "P.ID IN (SELECT DISTINCT PROFESSOR_ID FROM RESOURCE WHERE RESOURCE_NAME LIKE ?)", "P.ID IN (SELECT DISTINCT PROFESSOR_ID FROM ARTICLE WHERE ARTICLE_TITLE LIKE ?)", "P.ID IN (SELECT DISTINCT PROFESSOR_ID FROM PAPER_AUTHOR WHERE PAPER_ID IN (SELECT ID FROM PPAPER WHERE NAME LIKE ?))", "P.ID IN (SELECT DISTINCT PROFESSOR_ID FROM PATENT_AUTHOR WHERE PATENT_ID IN (SELECT ID FROM PPATENT WHERE NAME LIKE ?))"
			"P.NAME LIKE ?", "O.NAME LIKE ?", "P.DEPARTMENT LIKE ?", "P.DESCP LIKE ?", "P.SUBJECT LIKE ?", "P.INDUSTRY LIKE ?", "P.ID IN (SELECT DISTINCT PROFESSOR_ID FROM RESEARCH_AREA WHERE CAPTION LIKE ?)", "P.ID IN (SELECT DISTINCT PROFESSOR_ID FROM RESOURCE WHERE RESOURCE_NAME LIKE ?)", "P.ID IN (SELECT DISTINCT OWNER_ID FROM ARTICLE WHERE ARTICLE_TYPE='1' AND ARTICLE_TITLE LIKE ?)", "P.ID IN (SELECT DISTINCT PROFESSOR_ID FROM PAPER_AUTHOR WHERE PAPER_ID IN (SELECT ID FROM PPAPER WHERE NAME LIKE ?))", "P.ID IN (SELECT DISTINCT PROFESSOR_ID FROM PATENT_AUTHOR WHERE PATENT_ID IN (SELECT ID FROM PPATENT WHERE NAME LIKE ?))"
	}, handlerClass = StringHandler.class, isAnd = false) String key, @Nullable @Like String subject, @Nullable @Like String industry, @Nullable @Like String address, @Nullable Integer authType, int rows) throws SQLException;
	/**
@@ -1435,7 +1435,7 @@ public abstract class ProfessorDao {
					.append("( P.INDUSTRY LIKE ? ) OR")
					.append("(P.ID IN (SELECT DISTINCT PROFESSOR_ID FROM RESEARCH_AREA WHERE CAPTION LIKE ?)) OR")
					.append("(P.ID IN (SELECT DISTINCT PROFESSOR_ID FROM RESOURCE WHERE RESOURCE_NAME LIKE ?)) OR")
					.append("(P.ID IN (SELECT DISTINCT PROFESSOR_ID FROM ARTICLE WHERE ARTICLE_TITLE LIKE ?)) OR")
					.append("(P.ID IN (SELECT DISTINCT OWNER_ID FROM ARTICLE WHERE ARTICLE_TYPE='1' AND ARTICLE_TITLE LIKE ?)) OR")
					.append("(P.ID IN (SELECT DISTINCT PROFESSOR_ID FROM PAPER_AUTHOR WHERE PAPER_ID IN (SELECT ID FROM PPAPER WHERE NAME LIKE ?))) OR ")
					.append("(P.ID IN (SELECT DISTINCT PROFESSOR_ID FROM PATENT_AUTHOR WHERE PATENT_ID IN (SELECT ID FROM PPATENT WHERE NAME LIKE ?)))")
					.append(") ");

src/main/java/com/ekexiu/portal/found/Service.java

@@ -1,11 +1,5 @@
package com.ekexiu.portal.found;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.List;
import java.util.Map;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.web.annotation.Path;
import org.jfw.apt.web.annotation.operate.Get;
@@ -13,6 +7,12 @@ import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.util.jdbc.JdbcUtil;
import org.jfw.util.jdbc.PreparedStatementConfig;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.List;
import java.util.Map;
@Path("/found")
public class Service {
/**
@@ -37,8 +37,8 @@ public class Service {
	public List<Map<String,Object>> query(@JdbcConn Connection con,@DefaultValue("\"9\"") final String time,@DefaultValue("\"0\"") final String id,@DefaultValue("20") final int rows,final String ex)throws SQLException{
		return JdbcUtil.queryMaps(con, "SELECT * FROM 	( "+
		"SELECT ID id,'3' ctype,uid uid,title title,	last_reply_time tm,reply_count num,img img,null col	FROM question where state='1' UNION ALL "+
		"SELECT ARTICLE_ID id,	'1' ctype,professor_id uid,article_title title,publish_time tm,	0 num,article_img img,col_num col FROM article WHERE status = '1' AND article_type = '1' AND article_id <>? UNION ALL "+
		"SELECT ARTICLE_ID id,	'2' ctype,onerg_id uid,article_title title,publish_time tm,0 num,article_img img,col_num col FROM article WHERE status = '1' AND article_type = '2' AND article_id <>? 	) T "+
		"SELECT ARTICLE_ID id,	'1' ctype,owner_id uid,article_title title,publish_time tm,	0 num,article_img img,col_num col FROM article WHERE status = '1' AND article_type = '1' AND article_id <>? UNION ALL "+
		"SELECT ARTICLE_ID id,	'2' ctype,ownener_id uid,article_title title,publish_time tm,0 num,article_img img,col_num col FROM article WHERE status = '1' AND article_type = '2' AND article_id <>? 	) T "+
        "WHERE T.tm<? OR (T.tm = ? AND T.id > ?) ORDER BY tm DESC LIMIT ?", new PreparedStatementConfig() {
			@Override
			public void config(PreparedStatement ps) throws SQLException {

src/main/java/com/ekexiu/portal/leavemsg/Service.java

@@ -147,8 +147,8 @@ public class Service {
			}
			if (reciver == null) {
				if (article.getArticleType().equals("1") && (!uid.equals(article.getProfessorId()))) {
					this.notifyService.notify(con, article.getProfessorId(), uid, uname, lid, article.getArticleTitle(), NotifyType.LEAVE_MSG_AT_ARTICLE, runs);
				if (article.getArticleType().equals("1") && (!uid.equals(article.getOwnerId()))) {
					this.notifyService.notify(con, article.getOwnerId(), uid, uname, lid, article.getArticleTitle(), NotifyType.LEAVE_MSG_AT_ARTICLE, runs);
				}
			} else {
				if (!uid.equals(reciver)) {

src/main/java/com/ekexiu/portal/po/Article.java

@@ -17,7 +17,6 @@ import com.ekexiu.portal.pojo.EditProfessor;
@PrimaryKey("articleId")
public class Article implements CreateTimeSupported, ModifyTimeSupported {
	private String articleId;
	private String professorId;
	private String articleTitle;
	private String articleContent;
	private String subject;
@@ -26,7 +25,6 @@ public class Article implements CreateTimeSupported, ModifyTimeSupported {
	private String modifyTime;
	private String publishTime;
	private String articleImg;
	private String orgId;
	private String articleType;
	private int articleAgree;
	private int pageViews;
@@ -40,6 +38,8 @@ public class Article implements CreateTimeSupported, ModifyTimeSupported {
	 * 排序字段
	 */
	private long sortNum;
	private String ownerId;
	
	public EditProfessor getProfessor() {
		return professor;
@@ -66,13 +66,6 @@ public class Article implements CreateTimeSupported, ModifyTimeSupported {
	public void setArticleId(String articleId) {
		this.articleId = articleId;
	}
	@Column(handlerClass=FixLenStringHandler.class,dbType="CHAR(32)",nullable=true,renewable=false)
	public String getProfessorId() {
		return professorId;
	}
	public void setProfessorId(String professorId) {
		this.professorId = professorId;
	}
	@Column(value=DE.string_de,dbType="TEXT")
	public String getArticleTitle() {
		return articleTitle;
@@ -127,13 +120,6 @@ public class Article implements CreateTimeSupported, ModifyTimeSupported {
	public void setArticleImg(String articleImg) {
		this.articleImg = articleImg;
	}
	@Column(handlerClass=FixLenStringHandler.class,dbType="CHAR(32)",nullable=true,renewable=false)
	public String getOrgId() {
		return orgId;
	}
	public void setOrgId(String orgId) {
		this.orgId = orgId;
	}
	@Column(handlerClass=FixLenStringHandler.class,dbType="CHAR(1)",nullable=true,renewable=false)
	public String getArticleType() {
		return articleType;
@@ -183,4 +169,13 @@ public class Article implements CreateTimeSupported, ModifyTimeSupported {
	public void setSortNum(long sortNum) {
		this.sortNum = sortNum;
	}
	@Column(handlerClass=FixLenStringHandler.class,dbType="CHAR(32)",nullable=true,renewable=false)
	public String getOwnerId() {
		return ownerId;
	}
	public void setOwnerId(String ownerId) {
		this.ownerId = ownerId;
	}
}

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

@@ -342,13 +342,12 @@ public class ArticleService {
			article.setPageViews(0);
			article.setStatus("1");
			article.setPublishTime(this.publishTime());
			if (article.getProfessorId() != null && article.getOrgId() == null) {
				article.setArticleType("1");
			} else if (article.getProfessorId() == null && article.getOrgId() != null) {
				article.setArticleType("2");
			} else {
			if (article.getOwnerId() == null) {
				throw new JfwBaseException(-1, "错误参数：文章发布者ID");
			}
			if (article.getArticleType() == null) {
				throw new JfwBaseException(-2, "错误参数：文章类型");
			}
			this.articleDao.insert(con, article);
			con.commit();
			this.templateService.push(ContentType.Article, article.getArticleId());
@@ -381,13 +380,12 @@ public class ArticleService {
				article.setPageViews(0);
				article.setStatus("1");
				article.setPublishTime(this.publishTime());
				if (article.getProfessorId() != null && article.getOrgId() == null) {
					article.setArticleType("1");
				} else if (article.getProfessorId() == null && article.getOrgId() != null) {
					article.setArticleType("2");
				} else {
				if (article.getOwnerId() == null) {
					throw new JfwBaseException(-1, "错误参数：文章发布者ID");
				}
				if (article.getArticleType() == null) {
					throw new JfwBaseException(-2, "错误参数：文章类型");
				}
				this.articleDao.insert(con, article);
				this.keyWordService.refreshArticle(con, articleId, KeyWordService.splitKeyWord(article.getSubject()));
				if (professors != null) {
@@ -500,13 +498,12 @@ public class ArticleService {
				article.setArticleAgree(0);
				article.setPageViews(0);
				article.setStatus("0");
				if (article.getProfessorId() != null && article.getOrgId() == null) {
					article.setArticleType("1");
				} else if (article.getProfessorId() == null && article.getOrgId() != null) {
					article.setArticleType("2");
				} else {
				if (article.getOwnerId() == null) {
					throw new JfwBaseException(-1, "错误参数：文章发布者ID");
				}
				if (article.getArticleType() == null) {
					throw new JfwBaseException(-2, "错误参数：文章类型");
				}
				this.articleDao.insert(con, article);
				this.keyWordService.refreshArticle(con, articleId, null);
				if (professors != null) {
@@ -621,13 +618,12 @@ public class ArticleService {
				article.setArticleAgree(0);
				article.setPageViews(0);
				article.setStatus("2");
				if (article.getProfessorId() != null && article.getOrgId() == null) {
					article.setArticleType("1");
				} else if (article.getProfessorId() == null && article.getOrgId() != null) {
					article.setArticleType("2");
				} else {
				if (article.getOwnerId() == null) {
					throw new JfwBaseException(-1, "错误参数：文章发布者ID");
				}
				if (article.getArticleType() == null) {
					throw new JfwBaseException(-2, "错误参数：文章类型");
				}
				this.articleDao.insert(con, article);
				if (professors != null) {
					for (String professor : professors) {
@@ -839,8 +835,8 @@ public class ArticleService {
			this.articleAgreeDao.insert(con, articleAgree);
			this.growthLogService.agree(con, operateId);
			if (uname != null) {
				if (article.getArticleType().equals("1") && (!operateId.equals(article.getProfessorId()))) {
					this.notifyService.notify(con, article.getProfessorId(), operateId, uname, articleId, article.getArticleTitle(), NotifyType.AGREE_ARTICLE,
				if (article.getArticleType().equals("1") && (!operateId.equals(article.getOwnerId()))) {
					this.notifyService.notify(con, article.getOwnerId(), operateId, uname, articleId, article.getArticleTitle(), NotifyType.AGREE_ARTICLE,
							runs);
				}
			}
@@ -952,13 +948,13 @@ public class ArticleService {
		if (!articles.isEmpty()) {
			for (Article article : articles) {
				if ("1".equals(article.getArticleType())) {
					EditProfessor professor = this.professorDao.queryBaseInfo(con, article.getProfessorId());
					EditProfessor professor = this.professorDao.queryBaseInfo(con, article.getOwnerId());
					if (professor != null) {
						professor.setHasHeadImage(this.imageService.hasProfessorImage(professor.getId()));
					}
					article.setProfessor(professor);
				} else if ("2".equals(article.getArticleType())) {
					EditOrganization organization = this.orgDao.queryEditOrg(con, article.getOnergId());
					EditOrganization organization = this.orgDao.queryEditOrg(con, article.getOwnenerId());
					if (organization != null) {
						organization.setHasOrgLogo(this.imageService.hasOrgLogo(organization.getId()));
					}
@@ -979,13 +975,13 @@ public class ArticleService {
		if (!articles.isEmpty()) {
			for (Article article : articles) {
				if ("1".equals(article.getArticleType())) {
					EditProfessor professor = this.professorDao.queryBaseInfo(con, article.getProfessorId());
					EditProfessor professor = this.professorDao.queryBaseInfo(con, article.getOwnerId());
					if (professor != null) {
						professor.setHasHeadImage(this.imageService.hasProfessorImage(professor.getId()));
					}
					article.setProfessor(professor);
				} else if ("2".equals(article.getArticleType())) {
					EditOrganization organization = this.orgDao.queryEditOrg(con, article.getOnergId());
					EditOrganization organization = this.orgDao.queryEditOrg(con, article.getOwnenerId());
					if (organization != null) {
						organization.setHasOrgLogo(this.imageService.hasOrgLogo(organization.getId()));
					}
@@ -998,12 +994,12 @@ public class ArticleService {
	@Get
	@Path("/pqself")
	public PageQueryResult<SelfArticle> queryPageSelf(@JdbcConn Connection con, @Nullable String professorId, @Nullable String orgId,
	public PageQueryResult<SelfArticle> queryPageSelf(@JdbcConn Connection con, @Nullable String ownerId,
			@Nullable String articleTitle, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
		if (articleTitle != null) {
			articleTitle = "%" + articleTitle + "%";
		}
		return this.articleDao.queryPageForSelf(con, professorId, orgId, articleTitle, pageSize, pageNo);
		return this.articleDao.queryPageForSelf(con, ownerId, articleTitle, pageSize, pageNo);
	}
	@Get

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

@@ -837,7 +837,7 @@ public class ProfessorService {
	@Path("/agree/sum")
	public long agreeSum(@JdbcConn Connection con, final String id) throws SQLException {
		return JdbcUtil.queryLong(con,
				" select SUM(agree) from (SELECT article_agree agree FROM ARTICLE WHERE STATUS ='1' AND professor_id =? UNION ALL SELECT AGREE FROM ANSWER WHERE STATE='1' AND UID =? ) t",
				" select SUM(agree) from (SELECT article_agree agree FROM ARTICLE WHERE STATUS ='1' AND owner_id =? AND ARTICLE_TYPE = '1' UNION ALL SELECT AGREE FROM ANSWER WHERE STATE='1' AND UID =? ) t",
				new PreparedStatementConfig() {
					@Override
					public void config(PreparedStatement ps) throws SQLException {

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

@@ -182,9 +182,9 @@ public class WatchService {
				Article article = this.articleDao.queryOne(con, watch.getWatchObject());
				if (article != null) {
					if ("1".equals(article.getArticleType())) {
						article.setProfessor(this.professorDao.queryBaseInfo(con, article.getProfessorId()));
						article.setProfessor(this.professorDao.queryBaseInfo(con, article.getOwnerId()));
					} else if ("2".equals(article.getArticleType())) {
						article.setOrganization(this.orgDao.query(con, article.getOnergId()));
						article.setOrganization(this.orgDao.query(con, article.getOwnenerId()));
					}
				}
				watch.setArticle(article);