feat: 服务小类首页筛选

mini-app/src/main/java/com/onsiteservice/miniapp/service/category/ServiceCategoryService.java

@@ -13,6 +13,7 @@ import com.onsiteservice.miniapp.controller.category.vo.ServiceSubclassVO;
 import com.onsiteservice.util.AttrCopyUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import tk.mybatis.mapper.entity.Condition;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -23,9 +24,6 @@ import java.util.stream.Collectors;
 @Transactional(rollbackFor = Exception.class)
 public class ServiceCategoryService extends AbstractMapper<ServiceCategory> {
 
-    //@Resource
-    //private ServiceCategoryBizMapper serviceCategoryBizMapper;
-
     @Resource
     private ServiceCategoryMapper serviceCategoryMapper;
     @Resource
@@ -35,7 +33,11 @@ public class ServiceCategoryService extends AbstractMapper<ServiceCategory> {
     public Result<List<ServiceCategoryVO>> list(String keyWord) {
         List<ServiceCategory> serviceCategoryList = serviceCategoryMapper.selectAllOrderBySequence();
 
-        List<ServiceSubclass> serviceSubclassList = serviceSubclassMapper.selectByServiceNameLike(keyWord);
+        var condition = new Condition(ServiceSubclass.class);
+        condition.createCriteria().andLike("serviceName", keyWord)
+                .andEqualTo("enabled", true)
+                .andEqualTo("showInHome", true);
+        List<ServiceSubclass> serviceSubclassList = serviceSubclassMapper.selectByCondition(condition);
         Map<Integer, List<ServiceSubclass>> categoryIdServiceSubclassMap = serviceSubclassList.parallelStream().collect(Collectors.groupingBy(ServiceSubclass::getCategoryId));
 
         List<ServiceCategoryVO> serviceCategoryVOList = serviceCategoryList.parallelStream().map(e -> {