Merge remote-tracking branch 'origin/online1' into online1

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentServiceImpl.java

@@ -704,7 +704,9 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
             }
             if(organsNewCloudNewStudentNumMap.containsKey(organ.getId())){
                 organStudentVipData.setNewStudentNum(organsNewCloudNewStudentNumMap.get(organ.getId()));
-                organStudentVipData.setNewStudentDuty(new BigDecimal(organStudentVipData.getNewStudentNum()).divide(new BigDecimal(organStudentVipData.getTotalStudentNum()), 4, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100)).floatValue());
+                if(organStudentVipData.getNewStudentNum() > 0){
+                    organStudentVipData.setNewStudentDuty(new BigDecimal(organStudentVipData.getNewStudentNum()).divide(new BigDecimal(organStudentVipData.getTotalStudentNum()), 4, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100)).floatValue());
+                }
             }
             result.add(organStudentVipData);
         }