|
|
@@ -558,7 +558,7 @@ public class HealthPlanServiceImpl implements HealthPlanService {
|
|
|
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper<HealthPlan> w = new com.baomidou.mybatisplus.core.conditions.query.QueryWrapper<>();
|
|
|
w.eq("family_id", familyId);
|
|
|
w.in("status", "draft", "pending_review");
|
|
|
- if (teacherId != null) w.eq("teacher_id", teacherId);
|
|
|
+ if (teacherId != null) w.and(q -> q.eq("teacher_id", teacherId).or().isNull("teacher_id"));
|
|
|
w.orderByDesc("created_at");
|
|
|
return healthPlanMapper.selectList(w);
|
|
|
}
|