jiapeng 7 vuotta sitten
vanhempi
commit
34c6cc6813
1 muutettua tiedostoa jossa 7 lisäystä ja 7 poistoa
  1. 7 7
      src/main/java/com/ekexiu/portal/dao/ProfessorDao.java

+ 7 - 7
src/main/java/com/ekexiu/portal/dao/ProfessorDao.java

@ -1420,9 +1420,9 @@ public abstract class ProfessorDao {
1420 1420
	public PageQueryResult<EditProfessor> queryEditBaseInfo(Connection con, @Nullable String key, String subject, String industry, String address,
1421 1421
			Integer authType, int pageSize, int pageNo) throws SQLException {
1422 1422
		
1423
		String fromS="PROFESSOR P LEFT JOIN ORGANIZATION O ON P.ORG_ID=O.ID";
1424
		String selectS ="P.OFFICE,P.SUBJECT,P.INDUSTRY,P.ADDRESS,DEPARTMENT,ORGANIZATION.NAME,TITLE,"
1425
					+ " AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,STAR_LEVEL,CONSULT_COUNT,P.ORG_AUTH,P.SHARE_ID,P.SORT_FIRST";
1423
		String fromS=" PROFESSOR P LEFT JOIN ORGANIZATION O ON P.ORG_ID=O.ID ";
1424
		String selectS =" P.OFFICE,P.SUBJECT,P.INDUSTRY,P.ADDRESS,P.DEPARTMENT,O.NAME,P.TITLE,"
1425
					+ "P.AUTHENTICATION,P.AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,P.STAR_LEVEL,P.CONSULT_COUNT,P.ORG_AUTH,P.SHARE_ID,P.SORT_FIRST ";
1426 1426
		PageQueryResult<EditProfessor> queryResult = new PageQueryResult<EditProfessor>();
1427 1427
		StringBuilder sql = new StringBuilder();
1428 1428
		boolean hasKey = null != key;
@ -1459,16 +1459,16 @@ public abstract class ProfessorDao {
1459 1459
		boolean hasAddress = null != address;
1460 1460
		boolean hasAuthType = null != authType;
1461 1461
		if (hasSubject) {
1462
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(SUBJECT LIKE ?) ");
1462
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(P.SUBJECT LIKE ?) ");
1463 1463
		}
1464 1464
		if (hasIndustry) {
1465
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(INDUSTRY LIKE ?) ");
1465
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(P.INDUSTRY LIKE ?) ");
1466 1466
		}
1467 1467
		if (hasAddress) {
1468
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(ADDRESS LIKE ?) ");
1468
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(P.ADDRESS LIKE ?) ");
1469 1469
		}
1470 1470
		if (hasAuthType) {
1471
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(AUTH_TYPE = ?) ");
1471
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(P.AUTH_TYPE = ?) ");
1472 1472
		}
1473 1473

1474 1474
		StringBuilder whereSql = sql;