资源管理-校本题库管理

sstudy/src/main/java/com/xhkjedu/sstudy/controller/question/QuestionController.java

@@ -68,6 +68,16 @@ public class QuestionController {
         Integer page = tQuestion.getPage();
         Integer pageSize = tQuestion.getPageSize();
         N_Utils.validation(new Object[]{page,"显示页码",1,pageSize,"显示条数",1});
+        //获取所选章节信息
+        if(N_Utils.isNotEmpty(tQuestion.getDirectorid()) && !"0".equals(tQuestion.getDirectorid())){
+            TDirector director = directorService.getDirectorById(tQuestion.getDirectorid());
+            tQuestion.setDirectorLeaf(director.getLeaf());
+            //leaf 是否是叶子节点0不是1是
+            if(director.getLeaf() == 0){
+                //说明不是叶子节点，需要获取其子章节所有信息
+                tQuestion.setDirectorall(director.getDirectorall());
+            }
+        }
         PageHelper.startPage(page, pageSize);
         List<Map<String, Object>> list = tQuestionService.findAll(tQuestion);
         PageResult pageResult = PageUtil.getPageResult(new PageInfo(list));

sstudy/src/main/resources/mapper/question/QuestionMapper.xml

@@ -172,9 +172,12 @@
         <if test="question.lsbid!=null and question.lsbid!='0'.toString() and question.lsbid!=''">
             and qd.lsbid=#{question.lsbid}
         </if>
-        <if test="question.directorid!=null and question.directorid!='0'.toString() and question.directorid!=''">
+        <if test="question.directorid!=null and question.directorid!='0'.toString() and question.directorid!='' and question.directorLeaf==1">
             and qd.directorid=#{question.directorid}
         </if>
+        <if test="question.directorid!=null and question.directorid!='0'.toString() and question.directorid!='' and question.directorLeaf==0">
+            and d.directorall like concat('%',#{question.directorall},'%')
+        </if>
         <if test="question.hashear!=null and question.hashear == 1">
             and q.hashear=1
         </if>