小改动

leromro-core/src/main/java/com/leromro/core/controller/VolunteerInfoController.java

@@ -1,8 +1,5 @@
 package com.leromro.core.controller;
-
-
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.leromro.common.core.controller.BaseController;
 import com.leromro.common.core.domain.AjaxResult;
@@ -11,7 +8,6 @@ import com.leromro.common.core.page.TableDataInfo;
 import com.leromro.common.utils.SecurityUtils;
 import com.leromro.core.domain.VolunteerInfo;
 import com.leromro.core.domain.dto.VolunteerInfoDTO;
-import com.leromro.core.domain.vo.BusinessPriceVO;
 import com.leromro.core.domain.vo.VolunteerInfoDetailVO;
 import com.leromro.core.domain.vo.VolunteerInfoVO;
 import com.leromro.core.service.IVolunteerInfoService;
@@ -19,15 +15,11 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-import static com.leromro.common.utils.PageUtils.startPage;
 
 /**
  * 志愿者信息

leromro-core/src/main/resources/mapper/core/SecondOrdersMapper.xml

@@ -198,7 +198,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from l_second_order lso
         left join l_main_orders lmo on lso.main_order_id = lmo.main_order_id
         <where>
-            <if test="userId != null">and volunteer_id = #{userId}</if>
+            <if test="userId != null">and lso.volunteer_id = #{userId}</if>
             <if test="orderStatus != null ">and lso.order_status = #{orderStatus}</if>
         </where>
     </select>

leromro-core/src/main/resources/mapper/core/VolunteerInfoMapper.xml

@@ -118,7 +118,7 @@
         where app_status = 2
             <if test="name != null  and name != ''"> and lvi.name like concat('%', #{name}, '%')</if>
             <if test="score != null "> and lvi.score = #{score}</if>
-            <if test="serviceCategory != null "> and lvi.service_category = #{serviceCategory}</if>
+            <if test="serviceCategory != null and serviceCategory != ''"> and lvi.service_category = #{serviceCategory}</if>
             <if test="serviceType != null "> and lvi.service_type = #{serviceType}</if>
             <if test="serviceSubject != null "> and lvi.service_subject = #{serviceSubject}</if>
             <if test="skillDescribe != null  and skillDescribe != ''"> and lvi.skill_describe = #{skillDescribe}</if>