Merge remote-tracking branch 'origin/master'

4 years ago · 1a8abc96f8
parent 30ad4b516c 197bf12d25
commit 1a8abc96f8
1 changed files with 2 additions and 1 deletions
--- a/src/main/java/com/msdw/tms/service/impl/ExperimentalReportServiceImpl.java
+++ b/src/main/java/com/msdw/tms/service/impl/ExperimentalReportServiceImpl.java
@ -56,7 +56,8 @@ public class ExperimentalReportServiceImpl extends ServiceImpl<ExperimentalRepor
        Integer systemId = reportDao.querySystemId(recordId);

        //python实验
-        if (systemId == 1 | systemId == 4 | systemId == 5) {
+        if (systemId != 2 || systemId != 3) {
+            /*if (systemId == 1 | systemId == 4 | systemId == 5) {*/
            List<AchievementManagementVO> data = achievementManagementDao.queryPythonTest(recordId);
            HashMap<String, Object> map = new HashMap<>();
            map.put("data", data);