--update SQL;

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

@@ -840,7 +840,8 @@ public abstract class ArticleDao {
        if(firstPage){
        	queryResult.setPageNo(1);
        	sql = "(SELECT ARTICLE_ID,ARTICLE_TITLE,ARTICLE_IMG,ARTICLE_TYPE,CREATE_TIME,ORG_ID,PROFESSOR_ID FROM ARTICLE WHERE STATUS = '1')"
                	+ " UNION ALL (SELECT RESOURCE_ID,RESOURCE_NAME,NULL,'3',CREATE_TIME,NULL,PROFESSOR_ID FROM RESOURCE 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,"
                + " CREATE_TIME,ORG_ID,PROFESSOR_ID FROM RESOURCE WHERE STATUS = '1')";
            sql = sql + " ORDER BY CREATE_TIME DESC ";
            sql = sql + " LIMIT " + pageSize;
        }else{
@@ -855,7 +856,8 @@ public abstract class ArticleDao {
            --pageNo;
            int offset = (pageNo * pageSize);
            sql = "(SELECT ARTICLE_ID,ARTICLE_TITLE,ARTICLE_IMG,ARTICLE_TYPE,CREATE_TIME,ORG_ID,PROFESSOR_ID FROM ARTICLE WHERE STATUS = '1')"
                	+ " UNION ALL (SELECT RESOURCE_ID,RESOURCE_NAME,NULL,'3',CREATE_TIME,NULL,PROFESSOR_ID FROM RESOURCE 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,"
                + " CREATE_TIME,ORG_ID,PROFESSOR_ID FROM RESOURCE WHERE STATUS = '1')";
            sql = sql + " ORDER BY CREATE_TIME DESC ";
            sql = sql + " LIMIT " + pageSize+ " OFFSET " + offset;
        }

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

@@ -1069,9 +1069,11 @@ public abstract class ProfessorDao {
		boolean hasKey = null != key;
		if (hasKey) {
			sql.append(" WHERE (( P.ID IN (SELECT PROFESSOR_ID FROM RESEARCH_AREA WHERE CAPTION LIKE ?)) "
					+ " 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 (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 PROFESSOR_ID FROM PATENT WHERE NAME LIKE ?)) OR (P.DEPARTMENT LIKE ?))");
		}
		boolean hasSubject = null != subject;
		boolean hasIndustry = null != industry;
@@ -1112,6 +1114,9 @@ public abstract class ProfessorDao {
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
			}
			if (hasSubject) {
				ps.setString(paramIndex++, subject);
@@ -1193,6 +1198,9 @@ public abstract class ProfessorDao {
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
			}
			if (hasSubject) {
				ps.setString(paramIndex++, subject);
@@ -1282,9 +1290,11 @@ public abstract class ProfessorDao {
		boolean hasKey = null != key;
		if (hasKey) {
			sql.append(" WHERE ((P.ID IN (SELECT PROFESSOR_ID FROM RESEARCH_AREA WHERE CAPTION LIKE ?)) "
					+ " OR (ORG_ID IN(SELECT organization.ID FROM ORGANIZATION WHERE organization.NAME LIKE ?)) "
					+ " 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.ADDRESS LIKE ?)"
					+ " OR (P.ID IN (SELECT PROFESSOR_ID FROM RESOURCE WHERE RESOURCE_NAME 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 PROFESSOR_ID FROM PATENT WHERE NAME LIKE ?)) OR (P.DEPARTMENT LIKE ?) )");
		}
		boolean hasSubject = null != subject;
		boolean hasIndustry = null != industry;
@@ -1321,6 +1331,9 @@ public abstract class ProfessorDao {
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
			}
			if (hasSubject) {
				ps.setString(paramIndex++, subject);
@@ -1361,9 +1374,9 @@ public abstract class ProfessorDao {
		if (1 == pageNo) {
			queryResult.setPageNo(1);
			sql = new StringBuilder();
			sql.append("SELECT OFFICE,P.SUBJECT,P.INDUSTRY,P.ADDRESS,DEPARTMENT,organization.NAME,TITLE,"
			sql.append("SELECT OFFICE,P.SUBJECT,P.INDUSTRY,P.ADDRESS,DEPARTMENT,ORGANIZATION.NAME,TITLE,"
					+ " AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,STAR_LEVEL,CONSULT_COUNT,P.ORG_AUTH "
					+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON ORG_ID=organization.ID ");
					+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON ORG_ID=ORGANIZATION.ID ");
			if (whereSql.length() > 0) {
				sql.append(whereSql);
			}
@@ -1381,9 +1394,9 @@ public abstract class ProfessorDao {
			--pageNo;
			int offset = (pageNo * pageSize);
			sql = new StringBuilder();
			sql.append("SELECT OFFICE,P.SUBJECT,P.INDUSTRY,P.ADDRESS,DEPARTMENT,organization.NAME,TITLE,"
			sql.append("SELECT OFFICE,P.SUBJECT,P.INDUSTRY,P.ADDRESS,DEPARTMENT,ORGANIZATION.NAME,TITLE,"
					+ " AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,STAR_LEVEL,CONSULT_COUNT,P.ORG_AUTH "
					+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON ORG_ID=organization.ID ");
					+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON ORG_ID=ORGANIZATION.ID ");
			if (whereSql.length() > 0) {
				sql.append(whereSql);
			}
@@ -1400,6 +1413,9 @@ public abstract class ProfessorDao {
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
			}
			if (hasSubject) {
				ps.setString(paramIndex++, subject);

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

@@ -643,7 +643,7 @@ public class ArticleService {
		List<Article> articles = queryResult.getData();
		if(!articles.isEmpty()){
			for (Article article : articles) {
				if("1".equals(article.getArticleTitle())){
				if("1".equals(article.getArticleType())){
					EditProfessor professor = this.professorDao.queryBaseInfo(con, article.getProfessorId());
					if(professor != null){
						professor.setHasHeadImage(this.imageService.hasProfessorImage(professor.getId()));

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

@@ -13,6 +13,7 @@ import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.util.PageQueryResult;
import com.ekexiu.portal.dao.ArticleDao;
import com.ekexiu.portal.dao.ImageDao;
import com.ekexiu.portal.dao.OrgDao;
import com.ekexiu.portal.dao.ProfessorDao;
import com.ekexiu.portal.dao.ResearchAreaDao;
@@ -39,6 +40,8 @@ public class WatchService {
	private ArticleDao articleDao;
	@Autowrie
	private OrgDao orgDao;
	@Autowrie
	private ImageDao imageDao;
	
	public WatchDao getWatchDao() {
		return watchDao;
@@ -82,6 +85,12 @@ public class WatchService {
	public void setOrgDao(OrgDao orgDao) {
		this.orgDao = orgDao;
	}
	public ImageDao getImageDao() {
		return imageDao;
	}
	public void setImageDao(ImageDao imageDao) {
		this.imageDao = imageDao;
	}
	
	@Post
	@Path
@@ -120,9 +129,14 @@ public class WatchService {
			}
		}else if(2 == watchType){
			for (Watch watch : watchs) {
				Resource resource = this.resourceDao.queryBaseInfo(con, watch.getWatchObject());
				Resource resource = this.resourceDao.queryOne(con, watch.getWatchObject());
				if(resource != null) {
					resource.setEditProfessor(this.professorDao.queryBaseInfo(con, resource.getProfessorId()));
					resource.setImages(this.imageDao.queryRes(con, resource.getResourceId()));
					if("1".equals(resource.getResourceType())){
						resource.setEditProfessor(this.professorDao.queryBaseInfo(con, resource.getProfessorId()));
					}else if("2".equals(resource.getResourceType())){
						resource.setOrganization(this.orgDao.queryEditOrg(con, resource.getOrgId()));
					}
				}
				watch.setResource(resource);
			}