合并分支 'czq' 到 'master'

src/main/java/com/zjty/inspect/controller/InspectController.java

@@ -141,7 +141,7 @@ public class InspectController {
         Evaluation evaluation=new Evaluation();
         evaluation.setInEva(in);
         //判断评估类型
-        if(reform.getAssessmentType() == 1){
+        if(reform.getAssessmentType()!= null && reform.getAssessmentType() == 1){
             //快速评估
             reform.setSystemStructure(new SystemStructure());
             reform.setBrowser(new Browser());