From 54518511d26345c331427cb779c4cbd3056904bc Mon Sep 17 00:00:00 2001
From: zhanglipeng <chinazhanglipeng@qq.com>
Date: Sun, 5 Sep 2021 16:11:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E8=AE=A1=E5=88=92=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/benyi/thememonthplan/index.vue               | 2 +-
 ruoyi-ui/src/views/benyi/thememonthplanapproval/index.vue       | 2 +-
 .../project/benyi/controller/ByThemeMonthplanController.java    | 2 --
 .../src/main/resources/mybatis/benyi/ByThemeMonthplanMapper.xml | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ruoyi-ui/src/views/benyi/thememonthplan/index.vue b/ruoyi-ui/src/views/benyi/thememonthplan/index.vue
index 38d4396ac..491ff69cf 100644
--- a/ruoyi-ui/src/views/benyi/thememonthplan/index.vue
+++ b/ruoyi-ui/src/views/benyi/thememonthplan/index.vue
@@ -45,7 +45,7 @@
         </el-col>
         <el-col :xs="24" :ms="12" :md="5">
           <el-form-item label="主题内容" prop="themes">
-            <el-select v-model="queryParams.themes" size="small">
+            <el-select v-model="queryParams.themes" filterable size="small">
               <el-option
                 v-for="item in themeOptions"
                 :key="item.id"
diff --git a/ruoyi-ui/src/views/benyi/thememonthplanapproval/index.vue b/ruoyi-ui/src/views/benyi/thememonthplanapproval/index.vue
index a8a1cc277..8d16deaea 100644
--- a/ruoyi-ui/src/views/benyi/thememonthplanapproval/index.vue
+++ b/ruoyi-ui/src/views/benyi/thememonthplanapproval/index.vue
@@ -45,7 +45,7 @@
         </el-col>
         <el-col :xs="24" :ms="12" :md="5">
           <el-form-item label="主题内容" prop="themes">
-            <el-select v-model="queryParams.themes" size="small">
+            <el-select v-model="queryParams.themes" filterable size="small">
               <el-option
                 v-for="item in themeOptions"
                 :key="item.id"
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeMonthplanController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeMonthplanController.java
index 22326c6e4..18ebee792 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeMonthplanController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeMonthplanController.java
@@ -73,8 +73,6 @@ public class ByThemeMonthplanController extends BaseController {
             if (schoolCommon.isSchool() && !schoolCommon.isStringEmpty(classId)) {
                 byThemeMonthplan.setClassid(classId);
             }
-        }else{
-            byThemeMonthplan.setClassid(strClassId);
         }
         startPage();
         list = byThemeMonthplanService.selectByThemeMonthplanList(byThemeMonthplan);
diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByThemeMonthplanMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByThemeMonthplanMapper.xml
index bb5c5d6cc..6a93d30df 100644
--- a/ruoyi/src/main/resources/mybatis/benyi/ByThemeMonthplanMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/benyi/ByThemeMonthplanMapper.xml
@@ -54,7 +54,7 @@
             <if test="classid != null  and classid != ''">and a.classid = #{classid}</if>
             <if test="xnxq != null  and xnxq != ''">and a.xnxq = #{xnxq}</if>
             <if test="month != null ">and a.month = #{month}</if>
-            <if test="themes != null  and themes != ''">and a.themes = #{themes}</if>
+            <if test="themes != null  and themes != ''">and a.themes like concat('%;', #{themes}, ';%')</if>
             <if test="selfthemes != null  and selfthemes != ''">and a.selfthemes = #{selfthemes}</if>
             <if test="wxkc != null  and wxkc != ''">and a.wxkc = #{wxkc}</if>
             <if test="support != null  and support != ''">and a.support = #{support}</if>