|
@@ -11,12 +11,14 @@ import com.ym.mec.common.controller.BaseController;
|
|
|
import com.ym.mec.common.entity.HttpResponseResult;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.http.HttpStatus;
|
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
+import java.util.Arrays;
|
|
|
import java.util.List;
|
|
|
import java.util.Objects;
|
|
|
|
|
@@ -43,8 +45,9 @@ public class ChildrenDayDegreeDetailController extends BaseController {
|
|
|
childrenDayDetailDto.setUser(user);
|
|
|
childrenDayDetailDto.setChildrenDayDegreeDetails(userDegreeInfo);
|
|
|
Student student = studentDao.get(user.getId());
|
|
|
- if (student != null) {
|
|
|
- childrenDayDetailDto.setSubjectId(Integer.parseInt(student.getSubjectIdList()));
|
|
|
+ if (student != null && StringUtils.isNotBlank(student.getSubjectIdList())) {
|
|
|
+ List<String> subjectIds = Arrays.asList(student.getSubjectIdList().split(","));
|
|
|
+ childrenDayDetailDto.setSubjectId(Integer.parseInt(subjectIds.get(0)));
|
|
|
}
|
|
|
return succeed(childrenDayDetailDto);
|
|
|
}
|