|
|
@@ -7,17 +7,7 @@ import static java.math.BigDecimal.*;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.time.LocalDate;
|
|
|
import java.time.format.DateTimeFormatter;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Arrays;
|
|
|
-import java.util.Collections;
|
|
|
-import java.util.Comparator;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.HashSet;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
-import java.util.Objects;
|
|
|
-import java.util.Set;
|
|
|
+import java.util.*;
|
|
|
import java.util.function.Function;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@@ -1681,7 +1671,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
vipGroup.setOrganName(organNameMap.get(vipGroup.getOrganId()));
|
|
|
|
|
|
if ((Objects.isNull(aLong1) || aLong1 <= 0)
|
|
|
- && (classGroup.getStudentNum() <= 0)) {
|
|
|
+ && (Objects.isNull(classGroup) || Optional.ofNullable(classGroup.getStudentNum()).orElse(0) <= 0)) {
|
|
|
vipGroup.setEnableDelete(1);
|
|
|
}
|
|
|
|
