|
@@ -22,12 +22,10 @@ import com.qmth.paper.library.common.enums.RoleTypeEnum;
|
|
import com.qmth.paper.library.common.service.LibraryCommonService;
|
|
import com.qmth.paper.library.common.service.LibraryCommonService;
|
|
import com.qmth.paper.library.common.util.ServletUtil;
|
|
import com.qmth.paper.library.common.util.ServletUtil;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
-import org.apache.commons.lang3.SystemUtils;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
-import java.util.ArrayList;
|
|
|
|
import java.util.Arrays;
|
|
import java.util.Arrays;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.Set;
|
|
import java.util.Set;
|
|
@@ -170,7 +168,7 @@ public class PaperArchivesServiceImpl extends ServiceImpl<PaperArchivesMapper, P
|
|
String courseName = downLoadPaperParams.getCourseName();
|
|
String courseName = downLoadPaperParams.getCourseName();
|
|
String teacherName = downLoadPaperParams.getTeacherName();
|
|
String teacherName = downLoadPaperParams.getTeacherName();
|
|
String teachClazzName = downLoadPaperParams.getTeachClazzName();
|
|
String teachClazzName = downLoadPaperParams.getTeachClazzName();
|
|
- Boolean isBind = downLoadPaperParams.getIsBind() == 1;
|
|
|
|
|
|
+ Boolean isBind = downLoadPaperParams.getIsBind() == null ? null : downLoadPaperParams.getIsBind() == 1;
|
|
String param = downLoadPaperParams.getParam();
|
|
String param = downLoadPaperParams.getParam();
|
|
paperArchivesDetailResults = this.baseMapper.pageDetail(paperArchivesId, belongOrgId, majorName, clazzName, courseName, teacherName, teachClazzName, isBind, param);
|
|
paperArchivesDetailResults = this.baseMapper.pageDetail(paperArchivesId, belongOrgId, majorName, clazzName, courseName, teacherName, teachClazzName, isBind, param);
|
|
}
|
|
}
|