update:jmyl

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/adapay/SettleAccountService.java

@@ -32,7 +32,7 @@ public class SettleAccountService {
 		settleCountParams.put("member_id", accountInfo.getMemberId());
 		settleCountParams.put("app_id", appId);
 		settleCountParams.put("channel", "bank_account");
-		settleCountParams.put("account_info", accountInfo);
+		settleCountParams.put("account_info", accountInfoMap);
 		try {
 			Map<String, Object> resp = com.huifu.adapay.model.SettleAccount.create(settleCountParams, merchantKey);
 			if (StringUtils.equals("succeeded", resp.get("status").toString())) {

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

@@ -58,6 +58,9 @@ public class StudentManageController extends BaseController {
     public Object queryStudentList(@RequestBody StudentManageQueryInfo queryInfo){
         queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
         queryInfo.setIsExport(false);
+        if(queryInfo.getTenantId() == 28){
+        	queryInfo.setTenantId(1);
+        }
         return succeed(studentManageService.findStudentsByOrganId(queryInfo));
     }
 

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

@@ -71,6 +71,13 @@ public class StudentPaymentOrderController extends BaseController {
                 }
             }
         }
+        if(queryInfo.getTenantId() == 28){
+        	queryInfo.setTenantId(1);
+        	
+        	if(StringUtils.isBlank(queryInfo.getMerNos())){
+        		queryInfo.setMerNos("H004236");
+        	}
+        }
         return succeed(studentPaymentOrderPageInfo);
     }
 

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

@@ -55,6 +55,9 @@ public class TeacherController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('teacher/queryPage')")
     public HttpResponseResult<PageInfo<Teacher>> queryPage(TeacherQueryInfo queryInfo) {
         queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
+        if(queryInfo.getTenantId() == 28){
+        	queryInfo.setTenantId(1);
+        }
         return succeed(teacherService.queryPageDetail(queryInfo));
     }