Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectViewController.java

@@ -390,7 +390,7 @@ public class RuralProjectViewController extends BaseController {
                 currentConsultant.setZhucezigezhID(certificateInfo.getNum());
                 currentConsultant.setZhucezigezhKey(certificateInfo.getName());
                 for (MainDictDetail type : certificateMajor) {
-                    if(certificateInfo.getMajor().equals(type.getValue())){
+                    if(StringUtils.isNotBlank(certificateInfo.getMajor()) && certificateInfo.getMajor().equals(type.getValue())){
                         currentConsultant.setMajor(type.getLabel());
                     }
                 }