3.2.5 显示null问题

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/service/impl/PushLogicServiceImpl.java

@@ -83,8 +83,8 @@ public class PushLogicServiceImpl implements PushLogicService {
 
                                 // 组装本系统内考生信息
                                 clazzId = dpsPrintStuMap.get("clazzId") == null || "".equals(dpsPrintStuMap.get("clazzId")) ? null : Long.parseLong(String.valueOf(dpsPrintStuMap.get("clazzId")));
-                                clazzName = String.valueOf(dpsPrintStuMap.get("clazzName"));
-                                majorName = String.valueOf(dpsPrintStuMap.get("majorName"));
+                                clazzName = dpsPrintStuMap.get("clazzName") != null ? String.valueOf(dpsPrintStuMap.get("clazzName")) : null;
+                                majorName = dpsPrintStuMap.get("majorName") != null ? String.valueOf(dpsPrintStuMap.get("majorName")) :null;
                                 paperNumber = String.valueOf(dpsPrintStuMap.get("paperNumber"));
                                 student.put("clazzId", clazzId);
                                 student.put("clazzName", clazzName);