Merge remote-tracking branch 'origin/saas' into saas

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/School.java

@@ -197,6 +197,14 @@ public class School extends BaseEntity {
 		this.remark = remark;
 	}
 
+	public String getCooperationOrganName() {
+		return cooperationOrganName;
+	}
+
+	public void setCooperationOrganName(String cooperationOrganName) {
+		this.cooperationOrganName = cooperationOrganName;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -2964,7 +2964,8 @@ public class ExportController extends BaseController {
     public void exportSchoolList(HttpServletResponse response, SchoolQueryInfo queryInfo) throws IOException {
         queryInfo.setPage(1);
         queryInfo.setRows(49999);
-        
+
+        queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
         List<School> rows = schoolService.querySchoolExportList(queryInfo);
         if (rows.size() < 1) {
             throw new BizException("没有可导出数据");