|
|
|
@ -98,7 +98,7 @@ public class TeaTopicManageServiceImpl implements TeaTopicManageService {
|
|
|
|
|
* @Date 2023/12/1
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public PageInfo<QuestionAnswerDto> getQuestionAnswer(Integer index, Integer size, String schoolId, String className, String keyWord) {
|
|
|
|
|
public PageInfo<QuestionAnswerDto> getQuestionAnswer(Integer index, Integer size, String schoolId, String classId, String keyWord) {
|
|
|
|
|
QuestionAnswerExample questionAnswerExample = new QuestionAnswerExample();
|
|
|
|
|
questionAnswerExample.createCriteria().andSchoolidEqualTo(schoolId);
|
|
|
|
|
List<QuestionAnswerWithBLOBs> questionAnswers = questionAnswerMapper.selectByExampleWithBLOBs(questionAnswerExample);
|
|
|
|
@ -106,8 +106,8 @@ public class TeaTopicManageServiceImpl implements TeaTopicManageService {
|
|
|
|
|
UserExample.Criteria criteria = userTableExample.createCriteria();
|
|
|
|
|
UserExample.Criteria or = userTableExample.createCriteria();
|
|
|
|
|
criteria.andSchoolIdEqualTo(schoolId).andRoleIdEqualTo(4);
|
|
|
|
|
if (StringUtils.isNotBlank(className)) {
|
|
|
|
|
criteria.andClassNameEqualTo(className);
|
|
|
|
|
if (StringUtils.isNotBlank(classId)) {
|
|
|
|
|
criteria.andClassIdEqualTo(classId);
|
|
|
|
|
}
|
|
|
|
|
if (StringUtils.isNotBlank(keyWord)) {
|
|
|
|
|
criteria.andStudentIdEqualTo(keyWord);
|
|
|
|
|