|
@@ -237,7 +237,7 @@ public class PracticeGroupController extends BaseController {
|
|
|
result.put("isNewStudent", studentExitChargePractices<=0?0:1);
|
|
|
|
|
|
List<PracticeGroup> userStatusPracticeGroups = practiceGroupDao.findUserStatusPracticeGroups(sysUser.getId(), null, PracticeGroupType.COME_ON_PACKAGE);
|
|
|
- long normalGroupNum = userStatusPracticeGroups.stream().filter(p -> GroupStatusEnum.LOCK.equals(p.getGroupStatus()) || GroupStatusEnum.NORMAL.equals(p.getGroupStatus())).count();
|
|
|
+ long normalGroupNum = userStatusPracticeGroups.stream().filter(p -> GroupStatusEnum.NORMAL.equals(p.getGroupStatus())).count();
|
|
|
|
|
|
result.put("comeOnPackage", 1==student.getComeOnPackage()&&normalGroupNum<=0?1:0);
|
|
|
return succeed(result);
|