back

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

@@ -1,15 +1,10 @@
 package cn.com.qmth.examcloud.core.questions.api.controller;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import cn.com.qmth.examcloud.api.commons.enums.DataRuleType;
-import cn.com.qmth.examcloud.api.commons.security.bean.UserDataRule;
-import cn.com.qmth.examcloud.web.security.DataRule;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.PageImpl;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -73,7 +68,6 @@ public class QuesController extends ControllerSupport {
      *
      * @return
      */
-    @DataRule(type=DataRuleType.COURSE)
     @ApiOperation(value = "分页查询试题", notes = "分页查询试题")
     @GetMapping(value = "/question/{curPage}/{pageSize}")
     public ResponseEntity<Object> getAllQuestion(@ModelAttribute QuestionSearchCondition searchCondition,
@@ -81,13 +75,7 @@ public class QuesController extends ControllerSupport {
                                                  @PathVariable int pageSize) {
         User user = getAccessUser();
         searchCondition.setOrgId(user.getRootOrgId().toString());
-        UserDataRule userDataRule = super.getUserDataRule(DataRuleType.COURSE);
-        if (userDataRule.assertEmptyQueryResult()) {
-            return new ResponseEntity<>(new PageImpl<>(new ArrayList<>()), HttpStatus.OK);
-        }
-
-        return new ResponseEntity<>(quesService.findAll(searchCondition, curPage, pageSize,
-                userDataRule.getRefIds(), user.getUserId()), HttpStatus.OK);
+        return new ResponseEntity<>(quesService.findAll(searchCondition, curPage, pageSize), HttpStatus.OK);
     }
 
     /**

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

@@ -42,7 +42,7 @@ public interface QuesService {
      * @param userId
      * @return
      */
-    public Page<Question> findAll(QuestionSearchCondition searchCondition, int curPage, int pageSize, Set<Long> refIds, Long userId);
+    public Page<Question> findAll(QuestionSearchCondition searchCondition, int curPage, int pageSize);
 
     public void formatQuesCondition(QuestionSearchCondition searchCondition);
 

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

@@ -226,15 +226,13 @@ public class QuesServiceImpl implements QuesService {
      * @param userId
      * @return
      */
-    public Page<Question> findAll(QuestionSearchCondition searchCondition, int curPage, int pageSize, Set<Long> refIds, Long userId) {
+    public Page<Question> findAll(QuestionSearchCondition searchCondition, int curPage, int pageSize) {
         formatQuesCondition(searchCondition);
 
         Query query = new Query();
         query.addCriteria(Criteria.where("orgId").is(searchCondition.getOrgId()));
         query.addCriteria(Criteria.where("course.enable").is("true"));
 
-        query.addCriteria(Criteria.where("course.id").in(refIds).orOperator(Criteria.where("creator").is(userId)));
-
         if (StringUtils.isNotBlank(searchCondition.getCourseNo())) {
             query.addCriteria(Criteria.where("course.code").is(searchCondition.getCourseNo()));
         }