资源搜索页面增加地址标签，搜索栏可以直接搜索应用行业、学术领域和所在地。

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

@@ -200,7 +200,7 @@ public abstract class ProfessorDao {
		boolean hasKey = null != key;
		if (hasKey) {
			sql.append(
					" WHERE (( professor.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 ( professor.NAME LIKE ?))");
					" WHERE (( professor.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 ( professor.NAME LIKE ?) OR (professor.SUBJECT LIKE ?) OR (professor.INDUSTRY LIKE ?) OR (professor.ADDRESS LIKE ?))");
		}
		boolean hasSubject = null != subject;
		boolean hasIndustry = null != industry;
@@ -229,6 +229,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);
@@ -297,6 +300,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/dao/ResourceDao.java

@@ -346,23 +346,25 @@ public abstract class ResourceDao {
	 * @param key 查询内容（搜索框搜索内容-模糊查询）
	 * @param subject 学术领域
	 * @param industry 研究方向
	 * @param address 专家所在地
	 * @param pageSize 
	 * @param pageNo
	 * @return
	 * @throws SQLException
	 */
	public org.jfw.util.PageQueryResult<Resource> queryPage(Connection con,String key,String subject,String industry,int pageSize,int pageNo) throws SQLException{
	public org.jfw.util.PageQueryResult<Resource> queryPage(Connection con,String key,String subject,String industry,String address,int pageSize,int pageNo) throws SQLException{
        int _m_1 = 0;
        org.jfw.util.PageQueryResult<Resource> _result = new org.jfw.util.PageQueryResult<Resource>();
        int _m_3 = 1;
        boolean _m_2 = null == key;
        boolean _m_4 = null == subject;
        boolean _m_5 = null == industry;
        boolean _m6 = null == address;
        StringBuilder sql = new StringBuilder();
        boolean _m_7 = true;
        if(!_m_2){
            _m_7 =  false;
            sql.append(" WHERE ((RESOURCE_NAME LIKE ?) OR (SUPPORTED_SERVICES LIKE ?) OR (RESOURCE.DESCP LIKE ?) OR (COOPERATION_NOTES LIKE ?) OR (RESOURCE.SUBJECT LIKE ?) OR (RESOURCE.INDUSTRY LIKE ?)) ");
            sql.append(" WHERE ((RESOURCE_NAME LIKE ?) OR (SUPPORTED_SERVICES LIKE ?) OR (RESOURCE.SUBJECT LIKE ?) OR (RESOURCE.INDUSTRY LIKE ?) OR (RESOURCE.PROFESSOR_ID IN (SELECT PROFESSOR.ID FROM PROFESSOR WHERE PROFESSOR.ADDRESS LIKE ?))) ");
        }
        if(!_m_4){
            if(_m_7){
@@ -380,9 +382,17 @@ public abstract class ResourceDao {
                sql.append(" AND (RESOURCE.INDUSTRY LIKE ?) ");
            }
        }
        if(!_m6){
        	if(_m_7){
        		_m_7 =  false;
        		sql.append(" WHERE (RESOURCE.PROFESSOR_ID IN (SELECT PROFESSOR.ID FROM PROFESSOR WHERE PROFESSOR.ADDRESS LIKE ?)) ");
        	}else{
        		sql.append(" AND (RESOURCE.PROFESSOR_ID IN (SELECT PROFESSOR.ID FROM PROFESSOR WHERE PROFESSOR.ADDRESS LIKE ?)) ");
        	}
        }
        StringBuilder _m_6 = sql;
        sql = new StringBuilder();
        sql.append("SELECT COUNT(1) FROM RESOURCE");
        sql.append(" SELECT COUNT(1) FROM RESOURCE ");
        if(_m_6.length()>0){
            sql.append(_m_6);
        }
@@ -390,21 +400,10 @@ public abstract class ResourceDao {
        try{
            if(!_m_2){
                ps.setString(_m_3++,key);
            }
            if(!_m_2){
                ps.setString(_m_3++,key);
            }
            if(!_m_2){
                ps.setString(_m_3++,key);
            }
            if(!_m_2){
                ps.setString(_m_3++,key);
            }
            if(!_m_2){
            	ps.setString(_m_3++,key);
            }
            if(!_m_2){
            	ps.setString(_m_3++,key);
                ps.setString(_m_3++,key);
            }
            if(!_m_4){
                ps.setString(_m_3++,subject);
@@ -412,6 +411,9 @@ public abstract class ResourceDao {
            if(!_m_5){
                ps.setString(_m_3++,industry);
            }
            if(!_m6){
            	ps.setString(_m_3++,address);
            }
            _result.setPageSize(pageSize);
            ResultSet _pageRs = ps.executeQuery();
            try{
@@ -463,21 +465,10 @@ public abstract class ResourceDao {
        try{
            if(!_m_2){
                ps.setString(_m_3++,key);
            }
            if(!_m_2){
                ps.setString(_m_3++,key);
            }
            if(!_m_2){
                ps.setString(_m_3++,key);
            }
            if(!_m_2){
                ps.setString(_m_3++,key);
            }
            if(!_m_2){
            	ps.setString(_m_3++,key);
            }
            if(!_m_2){
            	ps.setString(_m_3++,key);
                ps.setString(_m_3++,key);
            }
            if(!_m_4){
                ps.setString(_m_3++,subject);
@@ -485,6 +476,9 @@ public abstract class ResourceDao {
            if(!_m_5){
                ps.setString(_m_3++,industry);
            }
            if(!_m6){
            	ps.setString(_m_3++,address);
            }
            ResultSet rs = ps.executeQuery();
            try{
                List<Resource> _m_13 = new ArrayList<Resource>();

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

@@ -141,11 +141,11 @@ public class ResourceService {
	
	@Get
	@Path("/pq")
	public PageQueryResult<Resource> queryPage(@JdbcConn(false) Connection con, @Nullable String key, @Nullable String subject, @Nullable String industry, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
	public PageQueryResult<Resource> queryPage(@JdbcConn(false) Connection con, @Nullable String key, @Nullable String subject, @Nullable String industry, @Nullable String address, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
		if(key!=null) key="%"+key+"%";
		if(subject!=null) subject ="%"+subject+"%";
		if(industry!=null)industry="%"+industry+"%";
		return this.resourceDao.queryPage(con, key, subject, industry, pageSize, pageNo);
		return this.resourceDao.queryPage(con, key, subject, industry, address, pageSize, pageNo);
	}
	
}

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

@@ -24,7 +24,6 @@ import com.ekexiu.portal.dao.ProfessorDao;
import com.ekexiu.portal.dao.UserDao;
import com.ekexiu.portal.mail.MailService;
import com.ekexiu.portal.mobile.MobilePhoneService;
import com.ekexiu.portal.po.Professor;
import com.ekexiu.portal.po.User;
import com.ekexiu.portal.pojo.SessionUser;
@@ -359,7 +358,8 @@ public class SysService {
			"userType=result.getType()",
			"userAuth=String.valueOf(result.isAuth())",
			"userEmail=result.getEmail()==null?\"\":result.getEmail()",
			"userName=result.getName()" })
//			"userName=result.getName()" 
			})
	@Post
	@Path("/regmail/{key}")
	public SessionUser regeMail(@JdbcConn(true) Connection con, @PathVar String key, String mail, 
@@ -381,9 +381,9 @@ public class SysService {
				return null;
			SessionUser ret = new SessionUser();
			ret.setId(user.getId());
			if (null != this.professorDao.query(con, user.getId())) {
				ret.setName(this.professorDao.query(con, user.getId()).getName());
			}
//			if (null != this.professorDao.query(con, user.getId())) {
//				ret.setName(this.professorDao.query(con, user.getId()).getName());
//			}
			ret.setMobilePhone(user.getMobilePhone());
			ret.setType(user.getUserType());
			ret.setEmail(user.getEmail());
@@ -460,7 +460,8 @@ public class SysService {
			"userType=result.getType()",
			"userAuth=String.valueOf(result.isAuth())",
			"userEmail=result.getEmail()==null?\"\":result.getEmail()",
			"userName=result.getName()" })
//			"userName=result.getName()" 
			})
	@Post
	@Path("/slogin")
	public SessionUser sLogin(@JdbcConn Connection con, String code,
@@ -470,13 +471,13 @@ public class SysService {
			return null;
		if (!mobile.equals(user.getMobilePhone()))
			return null;
		Professor professor = this.professorDao.query(con, code);
//		Professor professor = this.professorDao.query(con, code);
		SessionUser ret = new SessionUser();
		ret.setId(code);
		ret.setMobilePhone(mobile);
		ret.setType(user.getUserType());
		ret.setEmail(user.getEmail());
		ret.setName(professor.getName());
//		ret.setName(professor.getName());
		ret.setAuth(!DEFAULT_PASS_WORD.equals(user.getPasswd()));
		return ret;
	}
@@ -486,7 +487,8 @@ public class SysService {
			"userType=result.getType()",
			"userAuth=String.valueOf(result.isAuth())",
			"userEmail=result.getEmail()==null?\"\":result.getEmail()",
			"userName=result.getName()" })
//			"userName=result.getName()"
			})
	@Post
	@Path("/login")
	public SessionUser login(@JdbcConn Connection con, String lk, String pw)
@@ -501,9 +503,9 @@ public class SysService {
		SessionUser ret = new SessionUser();
		ret.setId(user.getId());
		if (null != this.professorDao.query(con, user.getId())) {
			ret.setName(this.professorDao.query(con, user.getId()).getName());
		}
//		if (null != this.professorDao.query(con, user.getId())) {
//			ret.setName(this.professorDao.query(con, user.getId()).getName());
//		}
		ret.setMobilePhone(user.getMobilePhone());
		ret.setType(user.getUserType());
		ret.setEmail(user.getEmail());