fix

examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/controller/PaperController.java

@@ -880,7 +880,7 @@ public class PaperController extends ControllerSupport {
         if (!isSuperAdmin() && !paper.getOrgId().equals(String.valueOf(user.getRootOrgId()))) {
             throw new StatusException("500", "非法请求");
         }
-        if(ud.assertNeedQueryRefIds()&&!ud.stringRefIds().contains(Long.valueOf(paper.getCourse().getId()))) {
+        if(ud.assertNeedQueryRefIds()&&!ud.stringRefIds().contains(paper.getCourse().getId())) {
         	throw new StatusException("500", "没有数据权限");
         }
         paperService.answerImport(paper, dataFile);

examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/controller/PaperStructController.java

@@ -3,6 +3,7 @@ package cn.com.qmth.examcloud.core.questions.api.controller;
 import cn.com.qmth.examcloud.api.commons.enums.DataRuleType;
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
 import cn.com.qmth.examcloud.api.commons.security.bean.UserDataRule;
+import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 import cn.com.qmth.examcloud.core.questions.dao.PaperStructRepo;
 import cn.com.qmth.examcloud.core.questions.dao.entity.PaperStruct;
@@ -98,6 +99,7 @@ public class PaperStructController extends ControllerSupport {
     @PutMapping(value = "/paperStruct")
     public ResponseEntity<Object> updatePaperStruct(@RequestBody PaperStruct ps) {
         User user = getAccessUser();
+        ps.setOrgId(user.getRootOrgId()+"");
         PaperStruct paperStruct = paperStructService.save(ps, user);
         if (paperStruct == null) {
             return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
@@ -116,9 +118,10 @@ public class PaperStructController extends ControllerSupport {
     @PostMapping(value = "/paperStruct")
     public ResponseEntity<Object> addPaperStruct(@RequestBody PaperStruct ps) {
         User user = getAccessUser();
+        ps.setOrgId(user.getRootOrgId()+"");
         PaperStruct paperStructTemp = paperStructService.checkNameUnique(ps.getName(), user.getRootOrgId().toString(), ps.getType());
         if (paperStructTemp != null) {
-            return new ResponseEntity<>("试卷结构名称重复，请重新命名！", HttpStatus.INTERNAL_SERVER_ERROR);
+            throw new  StatusException("试卷结构名称重复，请重新命名！");
         } else {
             PaperStruct paperStruct = paperStructService.save(ps, user);
             return new ResponseEntity<>(paperStruct, HttpStatus.OK);

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/ImportPaperService.java

@@ -286,7 +286,7 @@ public class ImportPaperService {
             String courseNo = paper.getCourseNo();
 
     		Course course = courseService.getCourse(user.getRootOrgId(), courseNo);
-    		if(ud.assertNeedQueryRefIds()&&!ud.stringRefIds().contains(Long.valueOf(course.getId()))) {
+    		if(ud.assertNeedQueryRefIds()&&!ud.stringRefIds().contains(course.getId())) {
     			throw new StatusException("没有数据权限");
     		}
 

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/PaperStructService.java

@@ -75,7 +75,7 @@ public class PaperStructService {
         query.addCriteria(Criteria.where("type").is(searchInfo.getType()));
 
         // 判断试卷结构
-        if (PaperStructType.EXACT.getName().equals(searchInfo.getType())) {
+        if (PaperStructType.EXACT.name().equals(searchInfo.getType())) {
             if (StringUtils.isNotBlank(searchInfo.getCourseNo())) {
                 if (!"ALL".equals(searchInfo.getCourseNo())) {
                     query.addCriteria(Criteria.where("courseNo").is(searchInfo.getCourseNo()));

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

@@ -284,7 +284,7 @@ public class PaperServiceImpl implements PaperService {
         query.addCriteria(Criteria.where("orgId").is(paperSearchInfo.getOrgId()));
         query.addCriteria(Criteria.where("paperType").is(PaperType.GENERATE.name()));
         query.addCriteria(Criteria.where("course.enable").is("true"));
-
+        query.addCriteria(Criteria.where("storage").ne(1));
         if (StringUtils.isNotBlank(paperSearchInfo.getCourseNo())) {
             query.addCriteria(Criteria.where("course.code").is(paperSearchInfo.getCourseNo()));
         }

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/QuesServiceImpl.java

@@ -237,7 +237,7 @@ public class QuesServiceImpl implements QuesService {
         query.addCriteria(Criteria.where("orgId").is(searchCondition.getOrgId()));
         query.addCriteria(Criteria.where("course.enable").is("true"));
         if (ud.assertNeedQueryRefIds()) {
-            query.addCriteria(Criteria.where("course.id").in(ud.getRefIds()));
+            query.addCriteria(Criteria.where("course.id").in(ud.stringRefIds()));
         }
         if (StringUtils.isNotBlank(searchCondition.getCourseNo())) {
             query.addCriteria(Criteria.where("course.code").is(searchCondition.getCourseNo()));