From 6f15499c6f496799de03830b858d59ac5ef76706 Mon Sep 17 00:00:00 2001
From: xiaoCJ <406612557@qq.com>
Date: Thu, 18 Jul 2024 14:26:37 +0800
Subject: [PATCH] 1

---
 .../sztzjy/resource_center/controller/api/CaseApi.java | 10 ++++++----
 src/main/resources/mapper/SysCaseQuestionMapper.xml    |  4 +++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/sztzjy/resource_center/controller/api/CaseApi.java b/src/main/java/com/sztzjy/resource_center/controller/api/CaseApi.java
index 08f522b..4e521ba 100644
--- a/src/main/java/com/sztzjy/resource_center/controller/api/CaseApi.java
+++ b/src/main/java/com/sztzjy/resource_center/controller/api/CaseApi.java
@@ -9,6 +9,7 @@ import com.sztzjy.resource_center.mapper.SysCaseQuestionMapper;
 import com.sztzjy.resource_center.mapper.SysCaseQuestionStepMapper;
 import com.sztzjy.resource_center.mapper.SysOneCatalogMapper;
 import com.sztzjy.resource_center.mapper.SysTopicAndCourseMapper;
+import com.sztzjy.resource_center.util.PageUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -76,9 +77,11 @@ public class CaseApi {
         sysTopicAndCourse.setOneName(sysCaseQuestion.getOneName());
         if (StringUtils.isNotBlank(sysCaseQuestion.getTwoId())) {
             sysTopicAndCourse.setTwoId(sysCaseQuestion.getTwoId());
+            sysTopicAndCourse.setTwoName(sysCaseQuestion.getTwoName());
         }
         if (StringUtils.isNotBlank(sysCaseQuestion.getThreeId())) {
             sysTopicAndCourse.setThreeId(sysCaseQuestion.getThreeId());
+            sysTopicAndCourse.setThreeName(sysCaseQuestion.getThreeName());
         }
         topicAndCourseMapper.insert(sysTopicAndCourse);
         return true;
@@ -100,12 +103,11 @@ public class CaseApi {
                                                             @RequestParam(required = false) String keyword,
                                                             @RequestParam(required = false) String systemOwner,
                                                             @RequestParam(required = false) String schoolId) {
-        PageHelper.startPage(index, size);
         SysOneCatalog sysOneCatalogs = getSysOneCatalogs(systemOwner);
         String oneId = sysOneCatalogs.getOneId();
         List<SysCaseQuestion> list = caseQuestionMapper.selectCaseByConditions(keyword, oneId, schoolId);
-        PageInfo<SysCaseQuestion> pageInfo = new PageInfo<SysCaseQuestion>(list);
-        return pageInfo;
+        PageInfo pageInfo1 = PageUtil.pageHelper(list, index, size);
+        return pageInfo1;
     }
 
     //案例题详情查询 caseId
@@ -151,7 +153,7 @@ public class CaseApi {
     @PostMapping("updateCase")
     public Boolean updateCase(@RequestBody SysCaseQuestion sysCaseQuestion) {
         List<SysTopicAndCourse> sysTopicAndCourses = getSysTopicAndCourses(sysCaseQuestion.getCaseId());
-        if (!sysTopicAndCourses.isEmpty()) {
+        if (sysTopicAndCourses.isEmpty()) {
             return false;
         } else {
             caseQuestionMapper.updateByPrimaryKey(sysCaseQuestion);
diff --git a/src/main/resources/mapper/SysCaseQuestionMapper.xml b/src/main/resources/mapper/SysCaseQuestionMapper.xml
index f366c86..a62f107 100644
--- a/src/main/resources/mapper/SysCaseQuestionMapper.xml
+++ b/src/main/resources/mapper/SysCaseQuestionMapper.xml
@@ -436,9 +436,11 @@
     <!--条件查询  无重复数据-->
     <select id="selectCaseByConditions" parameterType="java.lang.String" resultMap="BaseResultMap">
         select * from sys_case_questions s
+        left join sys_topic_and_course st
+        on s.case_id = st.topic_id
         <where>
             <if test="oneId != null and oneId != ''">
-                s.one_id = #{oneId}
+                st.one_id = #{oneId}
             </if>
             <if test="title != null and title != ''">
                 and s.title LIKE CONCAT('%', #{title}, '%')