|
@@ -62,8 +62,6 @@ class MatchTeamGroupService extends CrudService {
|
|
|
users.push({ ...JSON.parse(JSON.stringify(i)), user_name: _.get(user, 'user_id.name') });
|
|
|
}
|
|
|
return users;
|
|
|
-
|
|
|
-
|
|
|
}
|
|
|
|
|
|
async saveAll(data) {
|
|
@@ -122,6 +120,29 @@ class MatchTeamGroupService extends CrudService {
|
|
|
returnData[i].person.push(last[i]);
|
|
|
}
|
|
|
|
|
|
+ // 将人的信息换回来
|
|
|
+ if (type === '1') {
|
|
|
+ // 双打
|
|
|
+ } else {
|
|
|
+ // 单打
|
|
|
+ const users = [];
|
|
|
+ const conn = this.app.mongooseDB.get('base');
|
|
|
+ const schema = _.get(this.ctx.model, 'Base.User.schema');
|
|
|
+ const m = conn.model('User', schema);
|
|
|
+ for (const i of returnData) {
|
|
|
+ const { person } = i;
|
|
|
+ for (const p of person) {
|
|
|
+ const { user_id } = p;
|
|
|
+ const user = await this.userModel.findById(user_id).populate({
|
|
|
+ path: 'user_id',
|
|
|
+ select: 'name',
|
|
|
+ model: m,
|
|
|
+ });
|
|
|
+ p.user_name = _.get(user, 'user_id.name');
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
return returnData;
|
|
|
}
|
|
|
}
|