1

src/main/java/com/peanut/common/utils/MapUtils.java

@@ -9,6 +9,7 @@
 package com.peanut.common.utils;
 
 import java.util.HashMap;
+import java.util.Map;
 
 
 /**

src/main/java/com/peanut/common/utils/ObjectUtils.java

@@ -0,0 +1,21 @@
+package com.peanut.common.utils;
+
+import java.util.Map;
+
+public class ObjectUtils {
+
+    public boolean isNotBlank(Map<String,Object> m, String key){
+        if(!m.containsKey(key)){
+            return false;
+        }
+        Object o = m.get(key);
+        if (o==null){
+            return false;
+        }
+
+        if(o.toString()==""){
+            return false;
+        }
+        return true;
+    }
+}

src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.peanut.common.utils.ObjectUtils;
 import com.peanut.common.utils.R;
 import com.peanut.modules.common.dao.*;
 import com.peanut.modules.common.entity.*;
@@ -30,6 +31,8 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
     private CourseToSociologyDao courseToSociologyDao;
     @Autowired
     private CourseCatalogueDao courseCatalogueDao;
+    @Autowired
+    private ObjectUtils objectUtils;
 
     @Override
     public Page getCourseList(Map<String,Object> map) {
@@ -67,7 +70,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
                 return null;
             }
         }
-        wrapper.like(CourseEntity::getTitle,map.get("keywords").toString());
+        wrapper.like(objectUtils.isNotBlank(map,"keywords"),CourseEntity::getTitle,map.get("keywords").toString());
         Page<CourseEntity> courseEntityPage = this.getBaseMapper().selectPage(new Page<>(page, limit), wrapper);
         for (CourseEntity c:courseEntityPage.getRecords()){
             List<CourseCatalogueEntity> courseCatalogueEntities = courseCatalogueDao.selectList(new LambdaQueryWrapper<CourseCatalogueEntity>().eq(CourseCatalogueEntity::getCourseId, c.getId()).orderByAsc(CourseCatalogueEntity::getSort));