Merge remote-tracking branch 'origin/master'

mec-teacher/src/main/java/com/ym/mec/teacher/controller/VipGroupActivityController.java

@@ -109,7 +109,7 @@ public class VipGroupActivityController extends BaseController {
             return succeed(results);
         }else{
             SysConfig childrenDayIdConfig = sysConfigService.findByParamName(SysConfigService.CHILDREN_DAY_VIP_ACTIVITY_IDS);
-            if(Objects.nonNull(childrenDayIdConfig)||StringUtils.isNotBlank(childrenDayIdConfig.getParanValue())){
+            if(Objects.nonNull(childrenDayIdConfig)&&StringUtils.isNotBlank(childrenDayIdConfig.getParanValue())){
                 Set<Integer> activityIds = Arrays.stream(childrenDayIdConfig.getParanValue().split(",")).map(id->Integer.valueOf(id)).collect(Collectors.toSet());
                 Iterator<VipGroupActivity> iterator = vipGroupActivities.iterator();
                 if(iterator.hasNext()){
@@ -119,7 +119,7 @@ public class VipGroupActivityController extends BaseController {
                     }
                 }
             }
-            if(Objects.nonNull(sysConfig)||StringUtils.isNotBlank(sysConfig.getParanValue())){
+            if(Objects.nonNull(sysConfig)&&StringUtils.isNotBlank(sysConfig.getParanValue())){
                 Set<Integer> activityIds = Arrays.stream(sysConfig.getParanValue().split(",")).map(id->Integer.valueOf(id)).collect(Collectors.toSet());
                 Iterator<VipGroupActivity> iterator = vipGroupActivities.iterator();
                 if(iterator.hasNext()){

mec-web/src/main/java/com/ym/mec/web/controller/VipGroupActivityController.java

@@ -134,7 +134,7 @@ public class VipGroupActivityController extends BaseController {
         List<VipGroupActivity> vipGroupActivities = vipGroupActivityService.findByVipGroupCategory(categoryId, organIds, teacherId, applyToStudentType, null);
 
         SysConfig childrenDayIdConfig = sysConfigService.findByParamName(SysConfigService.CHILDREN_DAY_VIP_ACTIVITY_IDS);
-        if(Objects.nonNull(childrenDayIdConfig)||StringUtils.isNotBlank(childrenDayIdConfig.getParanValue())){
+        if(Objects.nonNull(childrenDayIdConfig)&&StringUtils.isNotBlank(childrenDayIdConfig.getParanValue())){
             Set<Integer> activityIds = Arrays.stream(childrenDayIdConfig.getParanValue().split(",")).map(id->Integer.valueOf(id)).collect(Collectors.toSet());
             Iterator<VipGroupActivity> iterator = vipGroupActivities.iterator();
             if(iterator.hasNext()){
@@ -145,7 +145,7 @@ public class VipGroupActivityController extends BaseController {
             }
         }
         SysConfig doubleElevenIdConfig = sysConfigService.findByParamName(SysConfigService.VIP_SPECIAL_ACTIVITY_IDS);
-        if(Objects.nonNull(doubleElevenIdConfig)||StringUtils.isNotBlank(doubleElevenIdConfig.getParanValue())){
+        if(Objects.nonNull(doubleElevenIdConfig)&&StringUtils.isNotBlank(doubleElevenIdConfig.getParanValue())){
             Set<Integer> activityIds = Arrays.stream(doubleElevenIdConfig.getParanValue().split(",")).map(id->Integer.valueOf(id)).collect(Collectors.toSet());
             Iterator<VipGroupActivity> iterator = vipGroupActivities.iterator();
             if(iterator.hasNext()){

mec-web/src/main/java/com/ym/mec/web/controller/education/EduVipGroupActivityController.java

@@ -79,7 +79,7 @@ public class EduVipGroupActivityController extends BaseController {
             return failed("学员信息不存在");
         }
         String organIds = student.getOrganId().toString();
-        List<VipGroupActivity> vipGroupActivities = vipGroupActivityService.findByVipGroupCategory(categoryId, organIds, teacherId, applyToStudentType,null);
+        List<VipGroupActivity> vipGroupActivities = vipGroupActivityService.findByVipGroupCategory(categoryId, organIds, teacherId, applyToStudentType, null);
         Iterator<VipGroupActivity> iterator = vipGroupActivities.iterator();
         while (iterator.hasNext()){
             VipGroupActivity vipGroupActivity = iterator.next();