renqianlong преди 1 година
родител
ревизия
9c9165b878
променени са 1 файла, в които са добавени 5 реда и са изтрити 1 реда
  1. 5 1
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeServiceImpl.java

+ 5 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeServiceImpl.java

@@ -951,7 +951,11 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
         Integer plush = this.baseMapper.getPlush(bo);
         HashMap<String, Object> stringObjectHashMap = new HashMap<>();
         stringObjectHashMap.put("plush",plush);
-        stringObjectHashMap.put("notPlush",classGradeStudentVos.size()-plush);
+        if (classGradeStudentVos.size()<=plush){
+            stringObjectHashMap.put("notPlush",0);
+        }else {
+            stringObjectHashMap.put("notPlush",classGradeStudentVos.size()-plush);
+        }
         return stringObjectHashMap;
     }