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

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

@@ -93,6 +93,50 @@ public abstract class ProfessorDao {
	@From(Professor.class)
	public abstract int updateStarAvg(Connection con, String id, @Set BigDecimal starAvg) throws SQLException;
	
	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 "
        		+ " FROM PROFESSOR P INNER 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);
        try{
        	ps.setString(index++,id);
            ResultSet rs = ps.executeQuery();
            try{
                List<EditProfessor> _result = new ArrayList<EditProfessor>();
                while(rs.next()){
                	EditProfessor professor =  new EditProfessor();
                    String _m_1 = rs.getString(1);
                    if(rs.wasNull()){
                        _m_1 = null;
                    }
                    professor.setOffice(_m_1);
                    String _m_2 = rs.getString(2);
                    if(rs.wasNull()){
                    	_m_2 = null;
                    }
                    professor.setAddress(_m_2);
                    Organization organization = new Organization();
                    organization.setId(rs.getString(3));
                    organization.setName(rs.getString(4));
                    professor.setOrganization(organization);
                    professor.setTitle(rs.getString(5));
                    professor.setAuthentication(rs.getInt(6));
                    professor.setAuthType(rs.getInt(7));
                    professor.setAuthStatus(rs.getInt(8));
                    professor.setId(rs.getString(9));
                    professor.setName(rs.getString(10));
                    _result.add(professor);
                }
                return _result;
            }finally{
                try{rs.close();}catch(Exception e1){}
            }
        }finally{
            try{ps.close();}catch(Exception e2){}
        }
    }
	
	/**
	 * 查询用户的认证状态。
	 * @param con

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

@@ -276,6 +276,18 @@ public class ProfessorService {
		this.professorDao.update(con, professor);
	}
	
	@Get
	@Path("/queryInvite")
	public List<EditProfessor> queryInvite(@JdbcConn Connection con, String id) throws SQLException{
		List<EditProfessor> professors = this.professorDao.queryInvite(con, id);
		for (EditProfessor professor : professors) {
			professor.setHasHeadImage(this.imageService.hasProfessorImage(professor.getId()));
			professor.setResearchAreas(this.researchAreaDao.query(con, professor.getId()));
			professor.setResources(this.resourceDao.queryList(con, professor.getId()));
		}
		return professors;
	}
	
	@Get
	@Path("/auth")
	public Professor queryAuth(@JdbcConn Connection con, String id) throws SQLException{