课程允许为空

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/basic/service/impl/CurriculumServiceImpl.java

@@ -109,19 +109,19 @@ public class CurriculumServiceImpl implements CurriculumService {
      * @param subjectDO
      */
     private void convertToId(CurriculumDetailDTO curriculumDetailDTO, SubjectDO subjectDO) {
-        if (curriculumDetailDTO.getMon().equals(subjectDO.getSubjectName())){
+        if (!StringUtils.isEmpty(curriculumDetailDTO.getMon()) && curriculumDetailDTO.getMon().equals(subjectDO.getSubjectName())){
             curriculumDetailDTO.setMon(subjectDO.getSubjectId().toString());
         }
-        if (curriculumDetailDTO.getTues().equals(subjectDO.getSubjectName())){
+        if (!StringUtils.isEmpty(curriculumDetailDTO.getTues()) && curriculumDetailDTO.getTues().equals(subjectDO.getSubjectName())){
             curriculumDetailDTO.setTues(subjectDO.getSubjectId().toString());
         }
-        if (curriculumDetailDTO.getThur().equals(subjectDO.getSubjectName())){
+        if (!StringUtils.isEmpty(curriculumDetailDTO.getThur()) && curriculumDetailDTO.getThur().equals(subjectDO.getSubjectName())){
             curriculumDetailDTO.setThur(subjectDO.getSubjectId().toString());
         }
-        if (curriculumDetailDTO.getWed().equals(subjectDO.getSubjectName())){
+        if (!StringUtils.isEmpty(curriculumDetailDTO.getWed()) && curriculumDetailDTO.getWed().equals(subjectDO.getSubjectName())){
             curriculumDetailDTO.setWed(subjectDO.getSubjectId().toString());
         }
-        if (curriculumDetailDTO.getFri().equals(subjectDO.getSubjectName())){
+        if (!StringUtils.isEmpty(curriculumDetailDTO.getFri()) && curriculumDetailDTO.getFri().equals(subjectDO.getSubjectName())){
             curriculumDetailDTO.setFri(subjectDO.getSubjectId().toString());
         }
     }
@@ -284,19 +284,19 @@ public class CurriculumServiceImpl implements CurriculumService {
      * @param subNameList
      */
     private void checkExists(CurriculumDetailDTO curriculumDetailDTO, List<String> subNameList) {
-        if (!subNameList.contains(curriculumDetailDTO.getMon())) {
+        if (!StringUtils.isEmpty(curriculumDetailDTO.getMon()) && !subNameList.contains(curriculumDetailDTO.getMon())) {
             throw new BizException(BizExceptionCode.NOT_EXISTS_SUBJECT.getCode(), String.format(BizExceptionCode.NOT_EXISTS_SUBJECT.getMessage(), curriculumDetailDTO.getMon()));
         }
-        if (!subNameList.contains(curriculumDetailDTO.getTues())) {
+        if (!StringUtils.isEmpty(curriculumDetailDTO.getTues()) && !subNameList.contains(curriculumDetailDTO.getTues())) {
             throw new BizException(BizExceptionCode.NOT_EXISTS_SUBJECT.getCode(), String.format(BizExceptionCode.NOT_EXISTS_SUBJECT.getMessage(), curriculumDetailDTO.getTues()));
         }
-        if (!subNameList.contains(curriculumDetailDTO.getWed())) {
+        if (!StringUtils.isEmpty(curriculumDetailDTO.getWed()) && !subNameList.contains(curriculumDetailDTO.getWed())) {
             throw new BizException(BizExceptionCode.NOT_EXISTS_SUBJECT.getCode(), String.format(BizExceptionCode.NOT_EXISTS_SUBJECT.getMessage(), curriculumDetailDTO.getWed()));
         }
-        if (!subNameList.contains(curriculumDetailDTO.getThur())) {
+        if (!StringUtils.isEmpty(curriculumDetailDTO.getThur()) && !subNameList.contains(curriculumDetailDTO.getThur())) {
             throw new BizException(BizExceptionCode.NOT_EXISTS_SUBJECT.getCode(), String.format(BizExceptionCode.NOT_EXISTS_SUBJECT.getMessage(), curriculumDetailDTO.getThur()));
         }
-        if (!subNameList.contains(curriculumDetailDTO.getFri())) {
+        if (!StringUtils.isEmpty(curriculumDetailDTO.getFri()) && !subNameList.contains(curriculumDetailDTO.getFri())) {
             throw new BizException(BizExceptionCode.NOT_EXISTS_SUBJECT.getCode(), String.format(BizExceptionCode.NOT_EXISTS_SUBJECT.getMessage(), curriculumDetailDTO.getFri()));
         }
     }