yonge 2 anos atrás
pai
commit
05fefa9913

+ 1 - 0
mec-web/src/main/java/com/ym/mec/web/controller/StudentManageController.java

@@ -60,6 +60,7 @@ public class StudentManageController extends BaseController {
         queryInfo.setIsExport(false);
         if(queryInfo.getTenantId() == 28){
         	queryInfo.setTenantId(1);
+        	queryInfo.setOrganId(null);
         }
         return succeed(studentManageService.findStudentsByOrganId(queryInfo));
     }

+ 8 - 7
mec-web/src/main/java/com/ym/mec/web/controller/StudentPaymentOrderController.java

@@ -57,6 +57,14 @@ public class StudentPaymentOrderController extends BaseController {
             }
             queryInfo.setUserIds(userIds);
         }
+        if(queryInfo.getTenantId() == 28){
+        	queryInfo.setTenantId(1);
+        	queryInfo.setOrganId(null);
+        	
+        	if(StringUtils.isBlank(queryInfo.getMerNos())){
+        		queryInfo.setMerNos("H004236");
+        	}
+        }
 
         PageInfo<StudentPaymentOrderDto> studentPaymentOrderPageInfo = studentPaymentOrderService.OrderQueryPage(queryInfo);
 
@@ -71,13 +79,6 @@ public class StudentPaymentOrderController extends BaseController {
                 }
             }
         }
-        if(queryInfo.getTenantId() == 28){
-        	queryInfo.setTenantId(1);
-        	
-        	if(StringUtils.isBlank(queryInfo.getMerNos())){
-        		queryInfo.setMerNos("H004236");
-        	}
-        }
         return succeed(studentPaymentOrderPageInfo);
     }
 

+ 1 - 0
mec-web/src/main/java/com/ym/mec/web/controller/TeacherController.java

@@ -57,6 +57,7 @@ public class TeacherController extends BaseController {
         queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
         if(queryInfo.getTenantId() == 28){
         	queryInfo.setTenantId(1);
+        	queryInfo.setOrganId(null);
         }
         return succeed(teacherService.queryPageDetail(queryInfo));
     }