diff --git a/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/impl/AdminActivityFormRelationServiceImpl.java b/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/impl/AdminActivityFormRelationServiceImpl.java index 57c5bba..72d826b 100644 --- a/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/impl/AdminActivityFormRelationServiceImpl.java +++ b/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/impl/AdminActivityFormRelationServiceImpl.java @@ -50,7 +50,7 @@ public class AdminActivityFormRelationServiceImpl implements IAdminActivityFormR } List relations = activityFormTemplateRelationService.list( new LambdaQueryWrapper() - .eq(MpActivityFormRelationEntity::getActivityId, activityId) + .eq(MpActivityFormRelationEntity::getActivityId, activityId).orderByDesc(MpActivityFormRelationEntity::getId) ); if (CollectionUtil.isEmpty(relations)) { return Collections.emptyList(); diff --git a/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/impl/AdminActivityFormServiceImpl.java b/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/impl/AdminActivityFormServiceImpl.java index fc046bb..219bd67 100644 --- a/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/impl/AdminActivityFormServiceImpl.java +++ b/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/impl/AdminActivityFormServiceImpl.java @@ -121,7 +121,7 @@ public class AdminActivityFormServiceImpl implements IAdminActivityFormService { } MpActivityFormRelationEntity newRelation = new MpActivityFormRelationEntity(); newRelation.setActivityId(req.getActivityId()); - newRelation.setFormId(req.getId()); + newRelation.setFormId(newForm.getId()); newRelation.setIsPrimary(CommonConstant.IS_NOT_DEFAULT); newRelation.setVersion(CommonUtils.generateVersionNumber(latestRelation.getVersion())); return activityFormRelationService.save(newRelation);