|
|
@@ -809,7 +809,7 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
|
|
|
.select(XjrUser::getId)
|
|
|
.select(XjrUser.class, x -> VoToColumnUtil.fieldsToColumns(XjrUser.class).contains(x.getProperty()))
|
|
|
.innerJoin(BaseClass.class, BaseClass::getTeacherId, XjrUser::getId)
|
|
|
- .innerJoin(AssessmentPlanAnswerClass.class, AssessmentPlanAnswerClass::getClassId, XjrUser::getId)
|
|
|
+ .innerJoin(AssessmentPlanAnswerClass.class, AssessmentPlanAnswerClass::getClassId, BaseClass::getId)
|
|
|
.eq(AssessmentPlanAnswerClass::getAssessmentTemplatePlanId, templatePlan.getId())
|
|
|
.eq(AssessmentPlanAnswerClass::getDeleteMark, DeleteMark.NODELETE.getCode())
|
|
|
);
|