|
@@ -498,7 +498,14 @@ class StudentService extends CrudService {
|
|
|
condition.termid = _.head(tids);
|
|
condition.termid = _.head(tids);
|
|
|
const r = await this.dataToExcel(condition, model);
|
|
const r = await this.dataToExcel(condition, model);
|
|
|
if (r) res.push(r);
|
|
if (r) res.push(r);
|
|
|
|
|
+ } else {
|
|
|
|
|
+ for (const tid of tids) {
|
|
|
|
|
+ condition.termid = tid;
|
|
|
|
|
+ const r = await this.dataToExcel(condition, model);
|
|
|
|
|
+ if (r) res.push(r);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
+ console.log(res);
|
|
|
if (res.length === 1) return _.head(res);
|
|
if (res.length === 1) return _.head(res);
|
|
|
else if (res.length > 1) {
|
|
else if (res.length > 1) {
|
|
|
let fn = '学生名单';
|
|
let fn = '学生名单';
|
