Startseite Erkunden Hilfe
Registrieren Anmelden
jiapeng
/
portal-web
Beobachten 3
Favorit hinzufügen 0
Fork 0
Code Issues 0 Pull-Requests 0 Commits 108 Releases 0 Wiki
Quellcode durchsuchen

--update SQL;

zzy.zhiyuan.foxmail vor 8 Jahren
Ursprung
3c2c915e89
Commit
7bb8670725
1 geänderte Dateien mit 62 neuen und 67 gelöschten Zeilen
Geteilte Ansicht Diff-Statistik anzeigen
  1. 62 67
      src/main/java/com/ekexiu/portal/dao/ProfessorDao.java

+ 62 - 67
src/main/java/com/ekexiu/portal/dao/ProfessorDao.java
Datei anzeigen 

@ -200,7 +200,7 @@ public abstract class ProfessorDao {
200 200 
	 */
201 201 
	public EditProfessor queryBaseInfo(Connection con, String id) throws SQLException {
202 202 
		int index = 1;
203 
        String sql = "SELECT P.OFFICE,P.DEPARTMENT,P.TITLE,AUTHENTICATION,AUTH_TYPE,AUTH_STATUS,P.ID,P.NAME,P.ADDRESS,ORGANIZATION.NAME "
203 
        String sql = "SELECT P.OFFICE,P.DEPARTMENT,P.TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,P.ADDRESS,ORGANIZATION.NAME "
204 204 
        		+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID = ORGANIZATION.ID WHERE P.ID = ?";
205 205 
        PreparedStatement ps = con.prepareStatement(sql);
206 206 
        try{

@ -260,7 +260,7 @@ public abstract class ProfessorDao {
260 260 
	 */
261 261 
	public EditProfessor queryEditBaseInfo(Connection con, String id) throws SQLException {
262 262 
		int index = 1;
263 
        String sql = "SELECT P.OFFICE,P.DEPARTMENT,P.TITLE,AUTHENTICATION,AUTH_TYPE,AUTH_STATUS,"
263 
        String sql = "SELECT P.OFFICE,P.DEPARTMENT,P.TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,"
264 264 
        		+ " P.ID,P.NAME,P.ADDRESS,P.STAR_LEVEL,P.CONSULT_COUNT,ORGANIZATION.NAME "
265 265 
        		+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID = ORGANIZATION.ID WHERE P.ID = ?";
266 266 
        PreparedStatement ps = con.prepareStatement(sql);

@ -321,7 +321,7 @@ public abstract class ProfessorDao {
321 321 
	public Professor query(Connection con, String id) throws SQLException{
322 322 
        int _m_1 = 1;
323 323 
        String sql = "SELECT P.OFFICE,P.SUBJECT,P.INDUSTRY,P.ADDRESS,P.DEPARTMENT,ORG_ID,P.TITLE,AUTHENTICATION,"
324 
        		+ "AUTH_TYPE,AUTH_STATUS,P.ID,P.NAME,P.DESCP,P.CREATE_TIME,P.MODIFY_TIME,PHONE,EMAIL,ORGANIZATION.NAME "
324 
        		+ "AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,P.DESCP,P.CREATE_TIME,P.MODIFY_TIME,P.PHONE,P.EMAIL,ORGANIZATION.NAME "
325 325 
        		+ "FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID = ORGANIZATION.ID WHERE P.ID = ?";
326 326 
        PreparedStatement ps = con.prepareStatement(sql);
327 327 
        try{

@ -406,13 +406,10 @@ public abstract class ProfessorDao {
406 406 
        }
407 407 
    }
408 408
409 
//	public abstract List<Professor> query(Connection con) throws SQLException;
410
411 409 
	public List<Professor> query(Connection con) throws SQLException{
412 
        String sql = "SELECT OFFICE,SUBJECT,INDUSTRY,PROVINCE,ADDRESS,DEPARTMENT,ORG_ID,organization.NAME AS ONAME,"
413 
        		+ " TITLE,AUTHENTICATION,AUTH_TYPE,AUTH_STATUS,professor.ID,professor.NAME AS PNAME,professor.DESCP,"
414 
        		+ " professor.CREATE_TIME,professor.MODIFY_TIME FROM PROFESSOR "
415 
        		+ " LEFT JOIN ORGANIZATION ON professor.ORG_ID=organization.ID ORDER BY ONAME,professor.ID";
410 
        String sql = "SELECT OFFICE,P.SUBJECT,P.INDUSTRY,P.PROVINCE,P.ADDRESS,DEPARTMENT,ORG_ID,organization.NAME AS ONAME,"
411 
        		+ " TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME AS PNAME,P.DESCP,P.CREATE_TIME,P.MODIFY_TIME FROM "
412 
        		+ " PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID=organization.ID ORDER BY ONAME,P.ID";
416 413 
        PreparedStatement ps = con.prepareStatement(sql);
417 414 
        try{
418 415 
            ResultSet rs = ps.executeQuery();

@ -662,12 +659,12 @@ public abstract class ProfessorDao {
662 659 
		if (1 == pageNo) {
663 660 
			_result.setPageNo(1);
664 661 
			sql = new StringBuilder();
665 
			sql.append("SELECT OFFICE,ADDRESS,TITLE,AUTHENTICATION,AUTH_TYPE,AUTH_STATUS,PROFESSOR.ID,PROFESSOR.NAME,ORG_ID,ORGANIZATION.NAME"
666 
	        		+ " FROM PROFESSOR LEFT JOIN ORGANIZATION ON PROFESSOR.ORG_ID=ORGANIZATION.ID ");
662 
			sql.append("SELECT OFFICE,P.ADDRESS,TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,ORG_ID,ORGANIZATION.NAME"
663 
	        		+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID=ORGANIZATION.ID ");
667 664 
			if (whereSql.length() > 0) {
668 665 
				sql.append(whereSql);
669 666 
			}
670 
			sql.append(" ORDER BY SORT_FIRST DESC,STAR_LEVEL DESC,PROFESSOR.ID ");
667 
			sql.append(" ORDER BY SORT_FIRST DESC,STAR_LEVEL DESC,P.ID ");
671 668 
			sql.append(" LIMIT ").append(pageSize);
672 669 
		} else {
673 670 
			int _pageSize = totalSize / pageSize;

@ -681,12 +678,12 @@ public abstract class ProfessorDao {
681 678 
			--pageNo;
682 679 
			int _m_10 = (pageNo * pageSize);
683 680 
			sql = new StringBuilder();
684 
			sql.append("SELECT OFFICE,ADDRESS,TITLE,AUTHENTICATION,AUTH_TYPE,AUTH_STATUS,PROFESSOR.ID,PROFESSOR.NAME,ORG_ID,ORGANIZATION.NAME"
685 
	        		+ " FROM PROFESSOR LEFT JOIN ORGANIZATION ON PROFESSOR.ORG_ID=ORGANIZATION.ID ");
681 
			sql.append("SELECT OFFICE,P.ADDRESS,TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,ORG_ID,ORGANIZATION.NAME"
682 
	        		+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID=ORGANIZATION.ID ");
686 683 
			if (whereSql.length() > 0) {
687 684 
				sql.append(whereSql);
688 685 
			}
689 
			sql.append(" ORDER BY SORT_FIRST DESC,STAR_LEVEL DESC,PROFESSOR.ID ");
686 
			sql.append(" ORDER BY SORT_FIRST DESC,STAR_LEVEL DESC,P.ID ");
690 687 
			sql.append(" LIMIT ").append(pageSize).append(" OFFSET ").append(_m_10);
691 688 
		}
692 689 
		ps = con.prepareStatement(sql.toString());

@ -760,10 +757,10 @@ public abstract class ProfessorDao {
760 757 
		StringBuilder sql = new StringBuilder();
761 758 
		boolean hasKey = null != key;
762 759 
		if (hasKey) {
763 
			sql.append(" WHERE (( PROFESSOR.ID IN (SELECT PROFESSOR_ID FROM RESEARCH_AREA WHERE CAPTION LIKE ?)) "
760 
			sql.append(" WHERE (( P.ID IN (SELECT PROFESSOR_ID FROM RESEARCH_AREA WHERE CAPTION LIKE ?)) "
764 761 
					+ " OR (ORG_ID IN(SELECT ORGANIZATION.ID FROM ORGANIZATION WHERE ORGANIZATION.NAME LIKE ?)) "
765 
					+ " OR ( PROFESSOR.NAME LIKE ?) OR (SUBJECT LIKE ?) OR (INDUSTRY LIKE ?) OR (PROVINCE LIKE ?) OR (ADDRESS LIKE ?) "
766 
					+ " OR PROFESSOR.ID IN (SELECT PROFESSOR_ID FROM RESOURCE WHERE RESOURCE_NAME LIKE ?))");
762 
					+ " OR ( P.NAME LIKE ?) OR (P.SUBJECT LIKE ?) OR (P.INDUSTRY LIKE ?) OR (P.PROVINCE LIKE ?) OR (P.ADDRESS LIKE ?) "
763 
					+ " OR P.ID IN (SELECT PROFESSOR_ID FROM RESOURCE WHERE RESOURCE_NAME LIKE ?))");
767 764 
		}
768 765 
		boolean hasSubject = null != subject;
769 766 
		boolean hasIndustry = null != industry;

@ -771,23 +768,23 @@ public abstract class ProfessorDao {
771 768 
		boolean hasAddress = null != address;
772 769 
		boolean hasAuthType = null != authType;
773 770 
		if (hasSubject) {
774 
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(SUBJECT LIKE ?)");
771 
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(P.SUBJECT LIKE ?)");
775 772 
		}
776 773 
		if (hasIndustry) {
777 
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(INDUSTRY LIKE ?)");
774 
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(P.INDUSTRY LIKE ?)");
778 775 
		}
779 776 
		if (hasProvince) {
780 
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(PROVINCE LIKE ?)");
777 
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(P.PROVINCE LIKE ?)");
781 778 
		}
782 779 
		if (hasAddress) {
783 
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(ADDRESS LIKE ?)");
780 
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(P.ADDRESS LIKE ?)");
784 781 
		}
785 782 
		if (hasAuthType) {
786 
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(AUTH_TYPE = ?)");
783 
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(P.AUTH_TYPE = ?)");
787 784 
		}
788 785 
		StringBuilder whereSql = sql;
789 786 
		sql = new StringBuilder();
790 
		sql.append("SELECT COUNT(1) FROM PROFESSOR");
787 
		sql.append("SELECT COUNT(1) FROM PROFESSOR P");
791 788 
		if (whereSql.length() > 0) {
792 789 
			sql.append(whereSql);
793 790 
		}

@ -847,12 +844,12 @@ public abstract class ProfessorDao {
847 844 
		if (1 == pageNo) {
848 845 
			_result.setPageNo(1);
849 846 
			sql = new StringBuilder();
850 
			sql.append("SELECT OFFICE,ADDRESS,TITLE,AUTHENTICATION,AUTH_TYPE,AUTH_STATUS,PROFESSOR.ID,PROFESSOR.NAME,ORG_ID,ORGANIZATION.NAME"
851 
	        		+ " FROM PROFESSOR LEFT JOIN ORGANIZATION ON PROFESSOR.ORG_ID=ORGANIZATION.ID ");
847 
			sql.append("SELECT OFFICE,P.ADDRESS,TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,ORG_ID,ORGANIZATION.NAME"
848 
	        		+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID=ORGANIZATION.ID ");
852 849 
			if (whereSql.length() > 0) {
853 850 
				sql.append(whereSql);
854 851 
			}
855 
			sql.append(" ORDER BY SORT_FIRST DESC,STAR_LEVEL DESC,PROFESSOR.ID ");
852 
			sql.append(" ORDER BY SORT_FIRST DESC,STAR_LEVEL DESC,P.ID ");
856 853 
			sql.append(" LIMIT ").append(pageSize);
857 854 
		} else {
858 855 
			int _pageSize = totalSize / pageSize;

@ -866,12 +863,12 @@ public abstract class ProfessorDao {
866 863 
			--pageNo;
867 864 
			int _m_10 = (pageNo * pageSize);
868 865 
			sql = new StringBuilder();
869 
			sql.append("SELECT OFFICE,ADDRESS,TITLE,AUTHENTICATION,AUTH_TYPE,AUTH_STATUS,PROFESSOR.ID,PROFESSOR.NAME,ORG_ID,ORGANIZATION.NAME"
870 
	        		+ " FROM PROFESSOR LEFT JOIN ORGANIZATION ON PROFESSOR.ORG_ID=ORGANIZATION.ID ");
866 
			sql.append("SELECT OFFICE,P.ADDRESS,TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,ORG_ID,ORGANIZATION.NAME"
867 
	        		+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID=ORGANIZATION.ID ");
871 868 
			if (whereSql.length() > 0) {
872 869 
				sql.append(whereSql);
873 870 
			}
874 
			sql.append(" ORDER BY SORT_FIRST DESC,STAR_LEVEL DESC,PROFESSOR.ID ");
871 
			sql.append(" ORDER BY SORT_FIRST DESC,STAR_LEVEL DESC,P.ID ");
875 872 
			sql.append(" LIMIT ").append(pageSize).append(" OFFSET ").append(_m_10);
876 873 
		}
877 874 
		ps = con.prepareStatement(sql.toString());

@ -968,32 +965,31 @@ public abstract class ProfessorDao {
968 965 
		StringBuilder sql = new StringBuilder();
969 966 
		boolean hasKey = null != key;
970 967 
		if (hasKey) {
971 
			sql.append(" WHERE (( professor.ID IN (SELECT PROFESSOR_ID FROM RESEARCH_AREA WHERE CAPTION LIKE ?)) "
968 
			sql.append(" WHERE ((P.ID IN (SELECT PROFESSOR_ID FROM RESEARCH_AREA WHERE CAPTION LIKE ?)) "
972 969 
					+ " OR (ORG_ID IN(SELECT organization.ID FROM ORGANIZATION WHERE organization.NAME LIKE ?)) "
973 
					+ " OR ( professor.NAME LIKE ?) OR (professor.SUBJECT LIKE ?) "
974 
					+ " OR (professor.INDUSTRY LIKE ?) OR (professor.ADDRESS LIKE ?)"
975 
					+ " OR (PROFESSOR.ID IN (SELECT PROFESSOR_ID FROM RESOURCE WHERE RESOURCE_NAME LIKE ?)) )");
970 
					+ " OR (P.NAME LIKE ?) OR (P.SUBJECT LIKE ?) OR (P.INDUSTRY LIKE ?) OR (P.ADDRESS LIKE ?)"
971 
					+ " OR (P.ID IN (SELECT PROFESSOR_ID FROM RESOURCE WHERE RESOURCE_NAME LIKE ?)) )");
976 972 
		}
977 973 
		boolean hasSubject = null != subject;
978 974 
		boolean hasIndustry = null != industry;
979 975 
		boolean hasAddress = null != address;
980 976 
		boolean hasAuthType = null != authType;
981 977 
		if (hasSubject) {
982 
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(SUBJECT LIKE ?)");
978 
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(P.SUBJECT LIKE ?)");
983 979 
		}
984 980 
		if (hasIndustry) {
985 
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(INDUSTRY LIKE ?)");
981 
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(P.INDUSTRY LIKE ?)");
986 982 
		}
987 983 
		if (hasAddress) {
988 
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(ADDRESS LIKE ?)");
984 
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(P.ADDRESS LIKE ?)");
989 985 
		}
990 986 
		if (hasAuthType) {
991 
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(AUTH_TYPE = ?)");
987 
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(P.AUTH_TYPE = ?)");
992 988 
		}
993 989
994 990 
		StringBuilder whereSql = sql;
995 991 
		sql = new StringBuilder();
996 
		sql.append("SELECT COUNT(1) FROM PROFESSOR");
992 
		sql.append("SELECT COUNT(1) FROM PROFESSOR P");
997 993 
		if (whereSql.length() > 0) {
998 994 
			sql.append(whereSql);
999 995 
		}

@ -1049,13 +1045,13 @@ public abstract class ProfessorDao {
1049 1045 
		if (1 == pageNo) {
1050 1046 
			_result.setPageNo(1);
1051 1047 
			sql = new StringBuilder();
1052 
			sql.append("SELECT OFFICE,SUBJECT,INDUSTRY,ADDRESS,DEPARTMENT,organization.NAME AS ONAME,TITLE,"
1053 
					+ " AUTHENTICATION,AUTH_TYPE,AUTH_STATUS,professor.ID,professor.NAME AS PNAME,STAR_LEVEL,CONSULT_COUNT "
1054 
					+ " FROM PROFESSOR LEFT JOIN ORGANIZATION ON ORG_ID=organization.ID ");
1048 
			sql.append("SELECT OFFICE,P.SUBJECT,P.INDUSTRY,P.ADDRESS,DEPARTMENT,organization.NAME,TITLE,"
1049 
					+ " AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,STAR_LEVEL,CONSULT_COUNT "
1050 
					+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON ORG_ID=organization.ID ");
1055 1051 
			if (whereSql.length() > 0) {
1056 1052 
				sql.append(whereSql);
1057 1053 
			}
1058 
			sql.append(" ORDER BY SORT_FIRST DESC,STAR_LEVEL DESC,PROFESSOR.ID ");
1054 
			sql.append(" ORDER BY SORT_FIRST DESC,STAR_LEVEL DESC,P.ID ");
1059 1055 
			sql.append(" LIMIT ").append(pageSize);
1060 1056 
		} else {
1061 1057 
			int _pageSize = totalSize / pageSize;

@ -1069,13 +1065,13 @@ public abstract class ProfessorDao {
1069 1065 
			--pageNo;
1070 1066 
			int _m_10 = (pageNo * pageSize);
1071 1067 
			sql = new StringBuilder();
1072 
			sql.append("SELECT OFFICE,SUBJECT,INDUSTRY,ADDRESS,DEPARTMENT,organization.NAME AS ONAME,TITLE,"
1073 
					+ " AUTHENTICATION,AUTH_TYPE,AUTH_STATUS,professor.ID,professor.NAME AS PNAME,STAR_LEVEL,CONSULT_COUNT "
1074 
					+ " FROM PROFESSOR LEFT JOIN ORGANIZATION ON ORG_ID=organization.ID ");
1068 
			sql.append("SELECT OFFICE,P.SUBJECT,P.INDUSTRY,P.ADDRESS,DEPARTMENT,organization.NAME,TITLE,"
1069 
					+ " AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,STAR_LEVEL,CONSULT_COUNT "
1070 
					+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON ORG_ID=organization.ID ");
1075 1071 
			if (whereSql.length() > 0) {
1076 1072 
				sql.append(whereSql);
1077 1073 
			}
1078 
			sql.append(" ORDER BY SORT_FIRST DESC,STAR_LEVEL DESC,PROFESSOR.ID ");
1074 
			sql.append(" ORDER BY SORT_FIRST DESC,STAR_LEVEL DESC,P.ID ");
1079 1075 
			sql.append(" LIMIT ").append(pageSize).append(" OFFSET ").append(_m_10);
1080 1076 
		}
1081 1077 
		ps = con.prepareStatement(sql.toString());

@ -1174,27 +1170,26 @@ public abstract class ProfessorDao {
1174 1170 
		StringBuilder sql = new StringBuilder();
1175 1171 
		boolean hasKey = null != key;
1176 1172 
		if (hasKey) {
1177 
			sql.append(" WHERE (( professor.ID IN (SELECT PROFESSOR_ID FROM RESEARCH_AREA WHERE CAPTION LIKE ?)) "
1173 
			sql.append(" WHERE (( P.ID IN (SELECT PROFESSOR_ID FROM RESEARCH_AREA WHERE CAPTION LIKE ?)) "
1178 1174 
					+ " OR (ORG_ID IN(SELECT organization.ID FROM ORGANIZATION WHERE organization.NAME LIKE ?)) "
1179 
					+ " OR ( professor.NAME LIKE ?) OR (professor.SUBJECT LIKE ?) "
1180 
					+ " OR (professor.INDUSTRY LIKE ?) OR (professor.ADDRESS LIKE ?))");
1175 
					+ " OR (P.NAME LIKE ?) OR (P.SUBJECT LIKE ?) OR (P.INDUSTRY LIKE ?) OR (P.ADDRESS LIKE ?))");
1181 1176 
		}
1182 1177 
		boolean hasSubject = null != subject;
1183 1178 
		boolean hasIndustry = null != industry;
1184 1179 
		boolean hasAddress = null != address;
1185 1180 
		if (hasSubject) {
1186 
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(SUBJECT LIKE ?)");
1181 
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(P.SUBJECT LIKE ?)");
1187 1182 
		}
1188 1183 
		if (hasIndustry) {
1189 
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(INDUSTRY LIKE ?)");
1184 
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(P.INDUSTRY LIKE ?)");
1190 1185 
		}
1191 1186 
		if (hasAddress) {
1192 
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(ADDRESS LIKE ?)");
1187 
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(P.ADDRESS LIKE ?)");
1193 1188 
		}
1194 1189
1195 1190 
		StringBuilder whereSql = sql;
1196 1191 
		sql = new StringBuilder();
1197 
		sql.append("SELECT COUNT(1) FROM PROFESSOR");
1192 
		sql.append("SELECT COUNT(1) FROM PROFESSOR P");
1198 1193 
		if (whereSql.length() > 0) {
1199 1194 
			sql.append(whereSql);
1200 1195 
		}

@ -1246,13 +1241,13 @@ public abstract class ProfessorDao {
1246 1241 
		if (1 == pageNo) {
1247 1242 
			_result.setPageNo(1);
1248 1243 
			sql = new StringBuilder();
1249 
			sql.append("SELECT OFFICE,SUBJECT,INDUSTRY,ADDRESS,DEPARTMENT,ORG_ID,organization.NAME AS ONAME,TITLE,"
1250 
					+ " AUTHENTICATION,professor.ID,professor.NAME AS PNAME,professor.DESCP,professor.CREATE_TIME,"
1251 
					+ " professor.MODIFY_TIME FROM PROFESSOR LEFT JOIN ORGANIZATION ON professor.ORG_ID=organization.ID ");
1244 
			sql.append("SELECT OFFICE,P.SUBJECT,P.INDUSTRY,P.ADDRESS,DEPARTMENT,ORG_ID,organization.NAME,"
1245 
					+ " TITLE,AUTHENTICATION,P.ID,P.NAME,P.DESCP,P.CREATE_TIME,P.MODIFY_TIME "
1246 
					+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID=organization.ID ");
1252 1247 
			if (whereSql.length() > 0) {
1253 1248 
				sql.append(whereSql);
1254 1249 
			}
1255 
			sql.append(" ORDER BY SORT_FIRST DESC,STAR_LEVEL DESC,PROFESSOR.ID ");
1250 
			sql.append(" ORDER BY SORT_FIRST DESC,STAR_LEVEL DESC,P.ID ");
1256 1251 
			sql.append(" LIMIT ").append(pageSize);
1257 1252 
		} else {
1258 1253 
			int _pageSize = totalSize / pageSize;

@ -1266,13 +1261,13 @@ public abstract class ProfessorDao {
1266 1261 
			--pageNo;
1267 1262 
			int _m_10 = (pageNo * pageSize);
1268 1263 
			sql = new StringBuilder();
1269 
			sql.append("SELECT OFFICE,SUBJECT,INDUSTRY,ADDRESS,DEPARTMENT,ORG_ID,organization.NAME AS ONAME,TITLE,"
1270 
					+ " AUTHENTICATION,professor.ID,professor.NAME AS PNAME,professor.DESCP,professor.CREATE_TIME,"
1271 
					+ " professor.MODIFY_TIME FROM PROFESSOR LEFT JOIN ORGANIZATION ON professor.ORG_ID=organization.ID ");
1264 
			sql.append("SELECT OFFICE,P.SUBJECT,P.INDUSTRY,P.ADDRESS,DEPARTMENT,ORG_ID,organization.NAME,"
1265 
					+ " TITLE,AUTHENTICATION,P.ID,P.NAME,P.DESCP,P.CREATE_TIME,P.MODIFY_TIME "
1266 
					+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID=organization.ID ");
1272 1267 
			if (whereSql.length() > 0) {
1273 1268 
				sql.append(whereSql);
1274 1269 
			}
1275 
			sql.append(" ORDER BY SORT_FIRST DESC,STAR_LEVEL DESC,PROFESSOR.ID ");
1270 
			sql.append(" ORDER BY SORT_FIRST DESC,STAR_LEVEL DESC,P.ID ");
1276 1271 
			sql.append(" LIMIT ").append(pageSize).append(" OFFSET ").append(_m_10);
1277 1272 
		}
1278 1273 
		ps = con.prepareStatement(sql.toString());

@ -1385,7 +1380,7 @@ public abstract class ProfessorDao {
1385 1380 
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(P.ADDRESS LIKE ?)");
1386 1381 
		}
1387 1382 
		if (hasAuthType) {
1388 
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(AUTH_TYPE = ?)");
1383 
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(P.AUTH_TYPE = ?)");
1389 1384 
		}
1390 1385 
		if (hasOrgName) {
1391 1386 
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(O.NAME LIKE ?)");

@ -1455,8 +1450,8 @@ public abstract class ProfessorDao {
1455 1450 
		if (1 == pageNo) {
1456 1451 
			_result.setPageNo(1);
1457 1452 
			sql = new StringBuilder();
1458 
			sql.append("SELECT OFFICE,SUBJECT,INDUSTRY,ADDRESS,DEPARTMENT,O.NAME AS ONAME,TITLE,AUTHENTICATION,"
1459 
					+ " AUTH_TYPE,AUTH_STATUS,P.ID,P.NAME AS PNAME,P.EMAIL,P.PHONE,L.ACTIVE_TIME "
1453 
			sql.append("SELECT OFFICE,P.SUBJECT,P.INDUSTRY,P.ADDRESS,DEPARTMENT,O.NAME,TITLE,AUTHENTICATION,"
1454 
					+ " P.AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,P.EMAIL,P.PHONE,L.ACTIVE_TIME "
1460 1455 
					+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION O ON P.ORG_ID=O.ID LEFT JOIN LUSER L ON P.ID=L.ID");
1461 1456 
			if (whereSql.length() > 0) {
1462 1457 
				sql.append(whereSql);

@ -1475,8 +1470,8 @@ public abstract class ProfessorDao {
1475 1470 
			--pageNo;
1476 1471 
			int _m_10 = (pageNo * pageSize);
1477 1472 
			sql = new StringBuilder();
1478 
			sql.append("SELECT OFFICE,SUBJECT,INDUSTRY,ADDRESS,DEPARTMENT,O.NAME AS ONAME,TITLE,AUTHENTICATION,"
1479 
					+ " AUTH_TYPE,AUTH_STATUS,P.ID,P.NAME AS PNAME,P.EMAIL,P.PHONE,L.ACTIVE_TIME "
1473 
			sql.append("SELECT OFFICE,P.SUBJECT,P.INDUSTRY,P.ADDRESS,DEPARTMENT,O.NAME,TITLE,AUTHENTICATION,"
1474 
					+ " P.AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,P.EMAIL,P.PHONE,L.ACTIVE_TIME "
1480 1475 
					+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION O ON P.ORG_ID=O.ID LEFT JOIN LUSER L ON P.ID=L.ID");
1481 1476 
			if (whereSql.length() > 0) {
1482 1477 
				sql.append(whereSql);