Merge remote-tracking branch 'origin/dev' into test

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

@@ -839,10 +839,10 @@ 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 WHERE STATUS = '1')"
        	sql = "(SELECT ARTICLE_ID,ARTICLE_TITLE,ARTICLE_IMG,ARTICLE_TYPE,PUBLISH_TIME,ORG_ID,PROFESSOR_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,"
                + " CREATE_TIME,ORG_ID,PROFESSOR_ID FROM RESOURCE WHERE STATUS = '1')";
            sql = sql + " ORDER BY CREATE_TIME DESC ";
                + " PUBLISH_TIME,ORG_ID,PROFESSOR_ID FROM RESOURCE WHERE STATUS = '1')";
            sql = sql + " ORDER BY PUBLISH_TIME DESC ";
            sql = sql + " LIMIT " + pageSize;
        }else{
            int pageNum = total / pageSize;
@@ -855,10 +855,10 @@ 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 WHERE STATUS = '1')"
            sql = "(SELECT ARTICLE_ID,ARTICLE_TITLE,ARTICLE_IMG,ARTICLE_TYPE,PUBLISH_TIME,ORG_ID,PROFESSOR_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,"
                + " CREATE_TIME,ORG_ID,PROFESSOR_ID FROM RESOURCE WHERE STATUS = '1')";
            sql = sql + " ORDER BY CREATE_TIME DESC ";
                + " PUBLISH_TIME,ORG_ID,PROFESSOR_ID FROM RESOURCE WHERE STATUS = '1')";
            sql = sql + " ORDER BY PUBLISH_TIME DESC ";
            sql = sql + " LIMIT " + pageSize+ " OFFSET " + offset;
        }
        ps = con.prepareStatement(sql);
@@ -879,7 +879,11 @@ public abstract class ArticleDao {
                    }
                    findInfo.setImage(image);
                    findInfo.setType(rs.getString(4));
                    findInfo.setCreateTime(rs.getString(5));
                    String createTime = rs.getString(5);
                    if(rs.wasNull()){
                    	createTime = null;
                    }
                    findInfo.setCreateTime(createTime);
                    String orgId = rs.getString(6);
                    if(rs.wasNull()){
                    	findInfo.setOwner(rs.getString(7));

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

@@ -25,7 +25,7 @@ public abstract class ResourceTmpDao {
        PageQueryResult<ResourceTmp> queryResult = new PageQueryResult<ResourceTmp>();
        boolean hasKey = null != key;
        StringBuilder sql = new StringBuilder();
        sql.append(" WHERE ORG_NAME = ?");
        sql.append(" WHERE COMP = ?");
        if(hasKey){
        	sql.append(" AND (NAME LIKE ? OR DOMAIN LIKE ? OR MAJOR_FUNC LIKE ?)");
        }

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

@@ -695,7 +695,7 @@ public class ArticleService {
		List<FindInfo> findInfos = queryResult.getData();
		if(!findInfos.isEmpty()){
			for (FindInfo findInfo : findInfos) {
				if("3".equals(findInfo.getType())){
				if("3".equals(findInfo.getType()) || "4".equals(findInfo.getType())){
					List<Image> images = this.imagesService.queryRes(con, findInfo.getId());
					if(images.size() > 0){
						findInfo.setImage(images.get(0).getImageSrc());

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

@@ -119,15 +119,23 @@ public class DataDictService {
		List<DataDictCode> keys = new ArrayList<DataDictCode>();
		for (DataDictCode hotKey : hotKeys) {
			if(hotKey.getCaption().indexOf(key) != -1){
				DataDictCode hotKey2 = new DataDictCode();
				hotKey2.setCount(hotKey.getCount());
				hotKey2.setCaption(hotKey.getCaption());
				keys.add(hotKey2);
				keys.add(hotKey);
			}
		}
		return keys;
	}
	
	@Get
	@Path("/qlHotKey")
	public List<DataDictCode> hotKey(@DefaultValue("10") int rows){
		List<DataDictCode> hotKeys = this.getHotKey();
		List<DataDictCode> keys = new ArrayList<DataDictCode>();
		for (int i = 0; i < rows; i++) {
			keys.add(hotKeys.get(i));
		}
		return keys;
	}
	
	private List<DataDictCode> queryDictCode(boolean isSubject){
		List<DataDictCode> ret = null;
		if(isSubject){

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

@@ -75,7 +75,9 @@ public class LeaveWordService {
		if(!leaveWords.isEmpty()){
			for (LeaveWord leaveWord : leaveWords) {
				EditProfessor professor = this.professorDao.queryBaseInfo(con, leaveWord.getSender());
				professor.setHasHeadImage(this.imageService.hasProfessorImage(leaveWord.getSender()));
				if(professor != null){
					professor.setHasHeadImage(this.imageService.hasProfessorImage(leaveWord.getSender()));
				}
				leaveWord.setProfessor(professor);
			}
		}

src/main/resources/database.sql

@@ -1346,3 +1346,5 @@ ALTER TABLE article_res ADD PRIMARY KEY (article_id, resource_id);
-- ----------------------------
ALTER TABLE article_pro ADD PRIMARY KEY (article_id, professor_id);
update resource set resource_type='1';