xiatian 4 rokov pred
rodič
commit
e71c763d08

+ 12 - 6
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/PaperServiceImpl.java

@@ -556,12 +556,18 @@ public class PaperServiceImpl implements PaperService {
         } else if (papers.get(0).getPaperType() == PaperType.GENERATE) {
             for (Paper paper : papers) {
                 List<String> examPaperIds = extractConfigService.getExamPaperId(paper.getCourseNo(), paper.getOrgId());
-                if (examPaperIds != null && examPaperIds.contains(paper.getId())) {
-                    msg = "待删除试卷有被调卷规则使用,不能删除!";
-                    msgMap.put("msg", msg);
-                    msgMap.put("paperName", paper.getName());
-                    return msgMap;
-                }
+//                if (examPaperIds != null && examPaperIds.contains(paper.getId())) {
+//                    msg = "待删除试卷有被调卷规则使用,不能删除!";
+//                    msgMap.put("msg", msg);
+//                    msgMap.put("paperName", paper.getName());
+//                    return msgMap;
+//                }
+                if(paper.getInUse()!=null&&paper.getInUse()==1) {
+					msg = "待删除试卷已调用,不能删除!";
+		            msgMap.put("msg", msg);
+		            msgMap.put("paperName", paper.getName());
+		            return msgMap;
+        		}
             }
         }
         paperDetailService.deletePaperDetailsByPapers(papers);