--no commit message

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/mapper/order/FgOrderMapper.java

@@ -119,13 +119,11 @@ public interface FgOrderMapper extends BaseMapper<Order>{
 			+ " SELECT s.academicLevel "
 			+ " FROM school_order_info s LEFT JOIN school_order   o ON s.orderId = o.id "
 			+ " WHERE  1=1 "
-			+ " eq(o.relationId,query.relationId) "
-			+ " eq(o.type,query.type) "
 			+ " GROUP BY s.academicLevel "
 			+ " HAVING s.academicLevel is not NULL "
 			+ " order by s.academicLevel desc "
 			+ " </script> ")
-	List<Integer> listAcademicLevel(@Param("query")QueryTypeAndRelationIdForm form);
+	List<Integer> listAcademicLevel();
 	
 	/**
 	 * 学级列表(其他学期)

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/mapper/studentorder/StudentOrderMapper.java

@@ -107,7 +107,7 @@ public interface StudentOrderMapper extends BaseMapper<StudentOrder>{
 			+ " where 1=1 and (ois.status = 3 or ois.status = 4) "
 			+ " eq(t.supplierId,query.supplierId) "
 			+ " eq(s.academicLevel,query.academicLevel) "
-			+ " like(r.resName,query.resName) "
+			+ " like(r.name,query.resName) "
 			+ " like(r.isbn,query.isbn) "
 			+ " GROUP BY s.resourceId "
 			+ "</script>")

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/order/FgOrderServiceImpl.java

@@ -289,10 +289,7 @@ public class FgOrderServiceImpl extends BaseModelServiceImpl<Order,Integer> impl
 
 	@Override
 	public List<Integer> listAcademicLevel() {
-		QueryTypeAndRelationIdForm form = new QueryTypeAndRelationIdForm();
-		form.setRelationId(redis.getMember().getRelationId());
-		form.setType(redis.getMember().getType());
-		List<Integer> list = fgOrderMapper.listAcademicLevel(form);
+		List<Integer> list = fgOrderMapper.listAcademicLevel();
 		return list;
 	}