--update professor表中的org_id字段可为空，所有关联查询机构表的改为LEFT JOIN

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

@@ -731,7 +731,7 @@ public abstract class ConsultDao {
					+ " THANKS_MONEY,THANKS_TIME,REVOVERY_TIME,READ_STATUS,CONSULT.CREATE_TIME,PROFESSOR.NAME,DEPARTMENT,"
					+ " PROFESSOR.TITLE,ADDRESS,OFFICE,AUTHENTICATION,AUTH_TYPE,AUTH_STATUS,ORGANIZATION.NAME "
					+ " FROM CONSULT INNER JOIN PROFESSOR ON CONSULTANT_ID = PROFESSOR.ID "
					+ " INNER JOIN ORGANIZATION ON PROFESSOR.ORG_ID = ORGANIZATION.ID ");
					+ " LEFT JOIN ORGANIZATION ON PROFESSOR.ORG_ID = ORGANIZATION.ID ");
			if (whereSql.length() > 0) {
				sql.append(whereSql);
			}
@@ -763,7 +763,7 @@ public abstract class ConsultDao {
					+ " THANKS_MONEY,THANKS_TIME,REVOVERY_TIME,READ_STATUS,CONSULT.CREATE_TIME,PROFESSOR.NAME,DEPARTMENT,"
					+ " PROFESSOR.TITLE,ADDRESS,OFFICE,AUTHENTICATION,AUTH_TYPE,AUTH_STATUS,ORGANIZATION.NAME "
					+ " FROM CONSULT INNER JOIN PROFESSOR ON CONSULTANT_ID = PROFESSOR.ID "
					+ " INNER JOIN ORGANIZATION ON PROFESSOR.ORG_ID = ORGANIZATION.ID ");
					+ " LEFT JOIN ORGANIZATION ON PROFESSOR.ORG_ID = ORGANIZATION.ID ");
			if (whereSql.length() > 0) {
				sql.append(whereSql);
			}
@@ -855,7 +855,11 @@ public abstract class ConsultDao {
					professor.setAuthentication(rs.getInt(24));
					professor.setAuthType(rs.getInt(25));
					professor.setAuthStatus(rs.getInt(26));
					professor.setOrgName(rs.getString(27));
					String orgName = rs.getString(27);
					if(rs.wasNull()){
						orgName = null;
					}
					professor.setOrgName(orgName);
					consult.setProfessor(professor);
					_m_11.add(consult);
				}
@@ -1102,7 +1106,7 @@ public abstract class ConsultDao {
					+ " THANKS_MONEY,THANKS_TIME,REVOVERY_TIME,CONSULT.READ_STATUS,CONSULT.CREATE_TIME,PROFESSOR.NAME,"
					+ " DEPARTMENT,TITLE,ADDRESS,OFFICE,AUTHENTICATION,AUTH_TYPE,AUTH_STATUS,ORGANIZATION.NAME "
					+ " FROM CONSULT INNER JOIN PROFESSOR ON PROFESSOR_ID = PROFESSOR.ID "
					+ " INNER JOIN ORGANIZATION ON PROFESSOR.ORG_ID = ORGANIZATION.ID ");
					+ " LEFT JOIN ORGANIZATION ON PROFESSOR.ORG_ID = ORGANIZATION.ID ");
			if (whereSql.length() > 0) {
				sql.append(whereSql);
			}
@@ -1134,7 +1138,7 @@ public abstract class ConsultDao {
					+ " THANKS_MONEY,THANKS_TIME,REVOVERY_TIME,CONSULT.READ_STATUS,CONSULT.CREATE_TIME,PROFESSOR.NAME,"
					+ " DEPARTMENT,TITLE,ADDRESS,OFFICE,AUTHENTICATION,AUTH_TYPE,AUTH_STATUS,ORGANIZATION.NAME "
					+ " FROM CONSULT INNER JOIN PROFESSOR ON PROFESSOR_ID = PROFESSOR.ID "
					+ " INNER JOIN ORGANIZATION ON PROFESSOR.ORG_ID = ORGANIZATION.ID ");
					+ " LEFT JOIN ORGANIZATION ON PROFESSOR.ORG_ID = ORGANIZATION.ID ");
			if (whereSql.length() > 0) {
				sql.append(whereSql);
			}
@@ -1222,7 +1226,11 @@ public abstract class ConsultDao {
					professor.setAuthentication(rs.getInt(24));
					professor.setAuthType(rs.getInt(25));
					professor.setAuthStatus(rs.getInt(26));
					professor.setOrgName(rs.getString(27));
					String orgName = rs.getString(27);
					if(rs.wasNull()){
						orgName = null;
					}
					professor.setOrgName(orgName);
					consult.setProfessor(professor);
					_m_11.add(consult);
				}

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

@@ -103,7 +103,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 "
        		+ " FROM PROFESSOR P INNER JOIN ORGANIZATION O ON P.ORG_ID=O.ID "
        		+ " 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);
        try{
@@ -124,8 +124,16 @@ public abstract class ProfessorDao {
                    }
                    professor.setAddress(_m_2);
                    Organization organization = new Organization();
                    organization.setId(rs.getString(3));
                    organization.setName(rs.getString(4));
                    String orgId = rs.getString(3);
                    if(rs.wasNull()){
                    	orgId = null;
                    }
                    organization.setId(orgId);
                    String orgName = rs.getString(4);
                    if(rs.wasNull()){
                    	orgName = null;
                    }
                    organization.setName(orgName);
                    professor.setOrganization(organization);
                    professor.setTitle(rs.getString(5));
                    professor.setAuthentication(rs.getInt(6));
@@ -219,7 +227,11 @@ public abstract class ProfessorDao {
                    	address = null;
                	}
                    professor.setAddress(address);
                    professor.setOrgName(rs.getString(10));
                    String orgName = rs.getString(10);
                    if(rs.wasNull()){
                    	orgName = null;
                    }
                    professor.setOrgName(orgName);
                    return professor;
                }else{
                    return null;
@@ -278,7 +290,11 @@ public abstract class ProfessorDao {
                    professor.setAddress(address);
                    professor.setStarLevel(rs.getBigDecimal(10));
                    professor.setConsultCount(rs.getInt(11));
                    professor.setOrgName(rs.getString(12));
                    String orgName = rs.getString(12);
                    if(rs.wasNull()){
                    	orgName = null;
                    }
                    professor.setOrgName(orgName);
                    return professor;
                }else{
                    return null;
@@ -333,7 +349,11 @@ public abstract class ProfessorDao {
                    }
                    _result.setDepartment(_m_6);
                    Organization organization = new Organization();
                    organization.setId(rs.getString(6));
                    String orgId = rs.getString(6);
                    if(rs.wasNull()){
                    	orgId = null;
                    }
                    organization.setId(orgId);
                    String _m_7 = rs.getString(7);
                    if(rs.wasNull()){
                        _m_7 = null;
@@ -361,7 +381,11 @@ public abstract class ProfessorDao {
                    	_m_10 = null;
                    }
                    _result.setEmail(_m_10);
                    organization.setName(rs.getString(18));
                    String orgName = rs.getString(18);
                    if(rs.wasNull()){
                    	orgName = null;
                    }
                    organization.setName(orgName);
                    _result.setOrganization(organization);
                    return _result;
                }else{
@@ -416,8 +440,16 @@ public abstract class ProfessorDao {
                    _obj.setAddress(_m_5);
                    _obj.setDepartment(rs.getString(6));
                    Organization organization = new Organization();
                    organization.setId(rs.getString(7));
                    organization.setName(rs.getString(8));
                    String orgId = rs.getString(7);
                    if(rs.wasNull()){
                    	orgId = null;
                    }
                    organization.setId(orgId);
                    String orgName = rs.getString(8);
                    if(rs.wasNull()){
                    	orgName = null;
                    }
                    organization.setName(orgName);
                    _obj.setOrganization(organization);
                    _obj.setTitle(rs.getString(9));
                    _obj.setAuthentication(rs.getInt(10));
@@ -679,7 +711,11 @@ public abstract class ProfessorDao {
                    professor.setId(rs.getString(7));
                    professor.setName(rs.getString(8));
                    professor.setOrgId(rs.getString(9));
                    professor.setOrgName(rs.getString(10));
                    String orgName = rs.getString(10);
                    if(rs.wasNull()){
                    	orgName = null;
                    }
                    professor.setOrgName(orgName);
					_m_11.add(professor);
				}
				return _result;
@@ -885,7 +921,11 @@ public abstract class ProfessorDao {
                    professor.setId(rs.getString(7));
                    professor.setName(rs.getString(8));
                    professor.setOrgId(rs.getString(9));
                    professor.setOrgName(rs.getString(10));
                    String orgName = rs.getString(10);
                    if(rs.wasNull()){
                    	orgName = null;
                    }
                    professor.setOrgName(orgName);
					_m_11.add(professor);
				}
				return _result;
@@ -1085,7 +1125,11 @@ public abstract class ProfessorDao {
						depart = null;
					}
					professor.setDepartment(depart);
					professor.setOrgName(rs.getString(6));
					String orgName = rs.getString(6);
					if(rs.wasNull()){
						orgName = null;
					}
					professor.setOrgName(orgName);
					String title = rs.getString(7);
					if(rs.wasNull()){
						title = null;
@@ -1275,8 +1319,16 @@ public abstract class ProfessorDao {
					}
					_obj.setDepartment(depart);
					Organization organization = new Organization();
					organization.setId(rs.getString(6));
					organization.setName(rs.getString(7));
					String orgId = rs.getString(6);
                    if(rs.wasNull()){
                    	orgId = null;
                    }
                    organization.setId(orgId);
                    String orgName = rs.getString(7);
                    if(rs.wasNull()){
                    	orgName = null;
                    }
                    organization.setName(orgName);
					_obj.setOrganization(organization);
					String title = rs.getString(8);
					if(rs.wasNull()){
@@ -1477,7 +1529,11 @@ public abstract class ProfessorDao {
						depart = null;
					}
					userInfo.setDepartment(depart);
					userInfo.setOrgName(rs.getString(6));
					String org = rs.getString(6);
					if(rs.wasNull()){
						org = null;
					}
					userInfo.setOrgName(org);
					String title = rs.getString(7);
					if(rs.wasNull()){
						title = null;

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

@@ -900,7 +900,11 @@ public abstract class ResourceDao {
                    professor.setAuthentication(rs.getInt(18));
                    professor.setAuthType(rs.getInt(19));
                    professor.setAuthStatus(rs.getInt(20));
                    professor.setOrgName(rs.getString(21));
                    String orgName = rs.getString(21);
                    if(rs.wasNull()){
                    	orgName = null;
                    }
                    professor.setOrgName(orgName);
                    _obj.setEditProfessor(professor);
                    _m_13.add(_obj);
                }

src/main/java/com/ekexiu/portal/po/Professor.java

@@ -138,7 +138,7 @@ public class Professor implements CreateTimeSupported, ModifyTimeSupported{
	 * 任职机构ID
	 * @return
	 */
	@Column(handlerClass=FixLenStringHandler.class,dbType="CHAR(32)",insertable=true,nullable=false,renewable=true,queryable=true)
	@Column(handlerClass=FixLenStringHandler.class,dbType="CHAR(32)",insertable=true,nullable=true,renewable=true,queryable=true)
	public String getOrgId() {
		return orgId;
	}

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

@@ -6,8 +6,8 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
import java.sql.SQLException;
import java.util.List;
import java.text.SimpleDateFormat;
import java.util.Date;

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

@@ -249,7 +249,7 @@ public class ProfessorService {
		if(professor.getId() == null ) {
			professor.setId(StringUtil.buildUUID());
		}
		if (professor.getOrgId() == null) {
		if (professor.getOrgId() == null && orgName != null) {
			if(null != this.orgDao.queryByName(con, orgName)){
				professor.setOrgId(this.orgDao.queryByName(con, orgName));
			} else {
@@ -509,7 +509,9 @@ public class ProfessorService {
	public ProfessorInfo qinfo(@JdbcConn(false) Connection con,@PathVar String id) throws SQLException{
		ProfessorInfo info = this.professorDao.queryInfo(con, id);
		if(info!=null){
			info.setOrgName(this.orgDao.query(con, info.getOrgId()).getName());
			if(info.getOrgId() != null){
				info.setOrgName(this.orgDao.query(con, info.getOrgId()).getName());
			}
			info.setHasHeadImage(this.imageService.hasProfessorImage(id));
			info.setEdus(this.professorEduBgDao.query(con, id));
			info.setHonors(this.honorDao.query(con, id));

src/main/java/com/ekexiu/portal/util/HttpUtil.java

@@ -4,6 +4,7 @@ import java.io.IOException;
import java.lang.reflect.Type;
import java.net.HttpURLConnection;
import java.net.URL;
import org.jfw.util.ConstData;
import org.jfw.util.io.IoUtil;
import org.jfw.util.json.JsonService;

src/main/java/com/ekexiu/portal/util/PictureVC.java

@@ -1,12 +1,12 @@
package com.ekexiu.portal.util;
import java.io.IOException;  
import java.io.IOException;
import javax.servlet.Servlet;
import javax.servlet.ServletException;  
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;  
import javax.servlet.http.HttpServletResponse;  
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
public class PictureVC extends HttpServlet implements Servlet {  

src/main/java/com/ekexiu/portal/util/VerifyCodeUtils.java

@@ -1,20 +1,20 @@
package com.ekexiu.portal.util;
import java.awt.Color;  
import java.awt.Font;  
import java.awt.Graphics;  
import java.awt.Graphics2D;  
import java.awt.RenderingHints;  
import java.awt.geom.AffineTransform;  
import java.awt.image.BufferedImage;  
import java.io.File;  
import java.io.FileOutputStream;  
import java.io.IOException;  
import java.io.OutputStream;  
import java.util.Arrays;  
import java.util.Random;  
  
import javax.imageio.ImageIO;  
import java.awt.Color;
import java.awt.Font;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.RenderingHints;
import java.awt.geom.AffineTransform;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.util.Arrays;
import java.util.Random;
import javax.imageio.ImageIO;
  
public class VerifyCodeUtils{