Joburgess 4 vuotta sitten
vanhempi
commit
4d902a12b7

+ 2 - 2
mec-biz/src/main/java/com/ym/mec/biz/service/impl/DegreeRegistrationServiceImpl.java

@@ -152,11 +152,11 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
             List<DegreeRegistration> updateDegrees = new ArrayList<>();
             if(ingLevelNum>0||ingTheoryLevelNum>0){
                 for (DegreeRegistration userLevelDegree : userLevelDegrees) {
-                    if(Objects.nonNull(userLevelDegree.getSporadicId())&&userLevelDegree.getSporadicId().equals(degreeRegistration.getSporadicId())){
+                    if(Objects.nonNull(userLevelDegree.getSporadicId())&&Objects.nonNull(userLevelDegree.getSporadicId())){
                         userLevelDegree.setStatus(0);
                         updateDegrees.add(userLevelDegree);
                     }
-                    if(Objects.nonNull(userLevelDegree.getTheoryLevel())&&userLevelDegree.getTheoryLevel().equals(degreeRegistration.getTheoryLevel())){
+                    if(Objects.nonNull(userLevelDegree.getTheoryLevel())&&StringUtils.isNotBlank(userLevelDegree.getTheoryLevel())){
                         userLevelDegree.setStatus(0);
                         updateDegrees.add(userLevelDegree);
                     }