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

into dev

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

@@ -182,7 +182,9 @@ public class OrgService {
	@Path("/queryByName")
	public EditOrganization queryByName(@JdbcConn Connection con,String name)throws SQLException{
		EditOrganization o = this.orgDao.queryOneByName(con, name);
		o.setHasOrgLogo(this.imageService.hasOrgLogo(o.getId()));
		if(o!=null) {
			o.setHasOrgLogo(this.imageService.hasOrgLogo(o.getId()));
		}
		return o;
	}