he2802 1 year ago
parent
commit
9f08e646b3

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

@@ -1076,22 +1076,22 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
                 exportVo.setStudyStatusStr("已完成");
             }
             exportVo.setTotalStudyCount(classGradeStudentVo.getUseStudyCount()+classGradeStudentVo.getStudyCount().intValue());
-            if(classGradeStudentVo.getUserStatus()==1){
+            if(Validator.isNotEmpty(classGradeStudentVo.getUserStatus())&&classGradeStudentVo.getUserStatus()==1){
                 exportVo.setUserStatus("变更");
             }else{
                 exportVo.setUserStatus("未变更");
             }
-            if(classGradeStudentVo.getOfficialStatus()==1){
+            if(Validator.isNotEmpty(classGradeStudentVo.getOfficialStatus())&&classGradeStudentVo.getOfficialStatus()==1){
                 exportVo.setOfficialStatus("是");
             }else{
                 exportVo.setOfficialStatus("否");
             }
-            if(classGradeStudentVo.getPeriodStatus()==1){
+            if(Validator.isNotEmpty(classGradeStudentVo.getPeriodStatus())&&classGradeStudentVo.getPeriodStatus()==1){
                 exportVo.setPeriodStatus("通过");
             }else{
                 exportVo.setPeriodStatus("未通过");
             }
-            if(classGradeStudentVo.getPeriodPlush()==1){
+            if(Validator.isNotEmpty(classGradeStudentVo.getPeriodPlush())&&classGradeStudentVo.getPeriodPlush()==1){
                 exportVo.setPeriodPlush("是");
             }else{
                 exportVo.setPeriodPlush("否");