From d3543bbea82d5928394fd64f219bb71fdae1b123 Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Fri, 23 Dec 2022 10:41:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=B5=84=E6=BA=90=EF=BC=8C?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9C=AA=E5=88=A0=E9=99=A4=E7=9A=84=E6=83=85?=
 =?UTF-8?q?=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../teacherOpenCourseMergeResourcesInfo.md    | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseMergeResourcesInfo.md b/web/src/main/resources/sql/jlw/teacherOpenCourseMergeResourcesInfo.md
index 2533dabe..a63e9445 100644
--- a/web/src/main/resources/sql/jlw/teacherOpenCourseMergeResourcesInfo.md
+++ b/web/src/main/resources/sql/jlw/teacherOpenCourseMergeResourcesInfo.md
@@ -50,6 +50,9 @@ queryByCondition
   @if(!isEmpty(resourcesInfoContent)){
   and t.resources_info_content =#resourcesInfoContent#
   @}
+  @if(!isEmpty(resourcesInfoStatus)){
+  and t.resources_info_status =#resourcesInfoStatus#
+  @}
   @if(isEmpty(resourcesInfoStatus)){
   @// 默认为空不查询删除状态的数据
   and t.resources_info_status != 0
@@ -108,6 +111,9 @@ queryByConditionQuery
   @if(!isEmpty(resourcesInfoContent)){
   and t.resources_info_content =#resourcesInfoContent#
   @}
+  @if(!isEmpty(resourcesInfoStatus)){
+  and t.resources_info_status =#resourcesInfoStatus#
+  @}
   @if(isEmpty(resourcesInfoStatus)){
   @// 默认为空不查询删除状态的数据
   and t.resources_info_status != 0
@@ -144,7 +150,7 @@ logicDeleteTeacherOpenCourseMergeResourcesInfo
 
   update teacher_open_course_merge_resources_info set resources_info_status = 0
   where 1 = 1
-  and find_in_set(teacher_open_course_merge_resources_info_id,#ids#) and resources_info_status != 0
+  and find_in_set(teacher_open_course_merge_resources_info_id,#ids#)
 
 getByIds
 ===
@@ -239,6 +245,9 @@ getTeacherOpenCourseMergeResourcesInfoValues
   @if(!isEmpty(resourcesInfoContent)){
   and t.resources_info_content =#resourcesInfoContent#
   @}
+  @if(!isEmpty(resourcesInfoStatus)){
+  and t.resources_info_status =#resourcesInfoStatus#
+  @}
   @if(!isEmpty(orgId)){
   and t.org_id =#orgId#
   @}
@@ -283,6 +292,9 @@ getValuesByQuery
   @if(!isEmpty(resourcesInfoContent)){
   and t.resources_info_content =#resourcesInfoContent#
   @}
+  @if(!isEmpty(resourcesInfoStatus)){
+  and t.resources_info_status =#resourcesInfoStatus#
+  @}
   @if(!isEmpty(orgId)){
   and t.org_id =#orgId#
   @}
@@ -332,6 +344,9 @@ getValuesByQueryNotWithPermission
   @if(!isEmpty(resourcesInfoContent)){
   and t.resources_info_content =#resourcesInfoContent#
   @}
+  @if(!isEmpty(resourcesInfoStatus)){
+  and t.resources_info_status =#resourcesInfoStatus#
+  @}
   @if(!isEmpty(orgId)){
   and t.org_id =#orgId#
   @}
@@ -390,6 +405,9 @@ getExcelValues
   @if(!isEmpty(resourcesInfoContent)){
   and t.resources_info_content =#resourcesInfoContent#
   @}
+  @if(!isEmpty(resourcesInfoStatus)){
+  and t.resources_info_status =#resourcesInfoStatus#
+  @}
   @if(!isEmpty(orgId)){
   and t.org_id =#orgId#
   @}
@@ -440,6 +458,9 @@ getExcelValues
   @if(!isEmpty(resourcesInfoContent)){
   and t.resources_info_content =#resourcesInfoContent#
   @}
+  @if(!isEmpty(resourcesInfoStatus)){
+  and t.resources_info_status =#resourcesInfoStatus#
+  @}
   @if(!isEmpty(orgId)){
   and t.org_id =#orgId#
   @}