Skip to content

Commit

Permalink
Fixed the conflict with other PRs.
Browse files Browse the repository at this point in the history
Fixed the conflict with other PRs.
  • Loading branch information
infstar committed Nov 1, 2024
1 parent db325a2 commit fe4b73f
Showing 1 changed file with 1 addition and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import org.apache.commons.lang3.math.NumberUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
Expand Down Expand Up @@ -189,7 +188,7 @@ public TraxStudentNo deleteTraxStudentNo(String pen) {
}

public UUID getSchoolIdFromRedisCache(String mincode) {
ca.bc.gov.educ.api.trax.model.dto.institute.School school = schoolService.getSchoolByMincodeFromRedisCache(mincode);
ca.bc.gov.educ.api.trax.model.dto.institute.School school = schoolService.getSchoolByMinCodeFromRedisCache(mincode);
return school != null && StringUtils.isNotBlank(school.getSchoolId())? UUID.fromString(school.getSchoolId()) : null;
}

Expand Down

0 comments on commit fe4b73f

Please sign in to comment.