From f47d14f5b8c710cc4a1f2f6d4ba9a4f4d19324c7 Mon Sep 17 00:00:00 2001
From: wlf <920607690@qq.com>
Date: Tue, 15 Jan 2019 10:09:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/master' into wlf

# Conflicts:
#	src/core/process/C_TeacherTeamFillOpeningReportOpinion.java
---
 .idea/misc.xml                                              | 2 +-
 src/core/process/C_TeacherTeamFillOpeningReportOpinion.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 9486b47..df60b67 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="10" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java b/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java
index 389d8bd..7198f9c 100644
--- a/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java
+++ b/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java
@@ -28,7 +28,7 @@ public class C_TeacherTeamFillOpeningReportOpinion extends TempProcess{
         fillInformation.execute(null);
     }
     protected boolean check() {
-        if(this.getGraduationDesignId()==null)
+        if(this.getGraduationDesignId()==null||this.getVMap()==null)
             return false;
         return true;
     }