Merge remote-tracking branch 'origin/test'

Conflicts:
	src/main/java/com/ekexiu/portal/dao/DemandDao.java

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

@@ -51,7 +51,7 @@ public abstract class DemandDao {
	@SelectList
	@OrderBy("ORDER BY CREATE_TIME DESC")
	public abstract List<Demand> queryForOrg(Connection con,String orgId)throws SQLException;
	
	
	@SelectList
	@OrderBy("ORDER BY CREATE_TIME DESC")
	public abstract List<Demand> queryByDemander(Connection con,String demander)throws SQLException;

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

@@ -172,7 +172,7 @@ public abstract class ProfessorDao {
	
	public List<EditProfessor> queryInvite(Connection con, String id) throws SQLException{
		int index = 1;
        String sql = "SELECT OFFICE,ADDRESS,ORG_ID,O.NAME,TITLE,AUTHENTICATION,AUTH_TYPE,AUTH_STATUS,P.ID,P.NAME,ORG_AUTH "
        String sql = "SELECT OFFICE,ADDRESS,ORG_ID,O.NAME,TITLE,AUTHENTICATION,P.AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,ORG_AUTH "
        		+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION O ON P.ORG_ID=O.ID "
        		+ " INNER JOIN LUSER L ON P.ID=L.ID WHERE L.INVITER_ID = ? ORDER BY P.CREATE_TIME DESC,P.ID";
        PreparedStatement ps = con.prepareStatement(sql);