yonge 2 년 전
부모
커밋
fccfb2ffd7

+ 2 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentManageServiceImpl.java

@@ -121,9 +121,11 @@ public class StudentManageServiceImpl implements StudentManageService {
         if(queryInfo.getTenantId() == 28){
         	queryInfo.setOrganId(null);
         	jmCount = studentManageDao.countStudentByOrganId(params);
+            params.put("offset", pageInfo.getOffset());
         	dataList = studentManageDao.findStudentsByOrganId(params);
         	
         	queryInfo.setTenantId(1);
+            MapUtil.populateMap(params, queryInfo);
         }
 
         if(StringUtils.isNotEmpty(queryInfo.getOrganId())){

+ 2 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentOrderServiceImpl.java

@@ -635,12 +635,14 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
         if(queryInfo.getTenantId() == 28){
         	queryInfo.setOrganId(null);
         	jmCount = findCount(params);
+            params.put("offset", pageInfo.getOffset());
         	dataList = studentPaymentOrderDao.queryPageOrder(params);
         	
         	queryInfo.setTenantId(1);
         	if(StringUtils.isBlank(queryInfo.getMerNos())){
         		queryInfo.setMerNos("H004236");
         	}
+        	MapUtil.populateMap(params, queryInfo);
         }
         
         int count = this.findCount(params);