diff --git a/sky-server/src/main/java/com/sky/mapper/DishMapper.java b/sky-server/src/main/java/com/sky/mapper/DishMapper.java
index 4b00a93..038ab89 100644
--- a/sky-server/src/main/java/com/sky/mapper/DishMapper.java
+++ b/sky-server/src/main/java/com/sky/mapper/DishMapper.java
@@ -63,5 +63,10 @@ public interface DishMapper {
     @AutoFill(value = OperationType.UPDATE)
     void update(Dish dish);
 
-
+    /**
+     * 条件查询菜品和口味
+     * @param dish Dish
+     * @return List<Dish>
+     */
+    List<Dish> list(Dish dish);
 }
diff --git a/sky-server/src/main/java/com/sky/service/DishService.java b/sky-server/src/main/java/com/sky/service/DishService.java
index a0d77c5..9bd0459 100644
--- a/sky-server/src/main/java/com/sky/service/DishService.java
+++ b/sky-server/src/main/java/com/sky/service/DishService.java
@@ -44,8 +44,8 @@ public interface DishService {
 
     /**
      * 条件查询菜品和口味
-     * @param dish
-     * @return
+     * @param dish Dish
+     * @return List<DishVO>
      */
     List<DishVO> listWithFlavor(Dish dish);
 }
diff --git a/sky-server/src/main/java/com/sky/service/impl/DishServiceImpl.java b/sky-server/src/main/java/com/sky/service/impl/DishServiceImpl.java
index 53c9337..5300c74 100644
--- a/sky-server/src/main/java/com/sky/service/impl/DishServiceImpl.java
+++ b/sky-server/src/main/java/com/sky/service/impl/DishServiceImpl.java
@@ -13,15 +13,12 @@ import com.sky.mapper.DishFlavorMapper;
 import com.sky.mapper.DishMapper;
 import com.sky.mapper.SetMealDishMapper;
 import com.sky.result.PageResult;
-import com.sky.result.Result;
 import com.sky.service.DishService;
 import com.sky.vo.DishVO;
-import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PutMapping;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
@@ -149,8 +146,8 @@ public class DishServiceImpl implements DishService {
 
     /**
      * 条件查询菜品和口味
-     * @param dish
-     * @return
+     * @param dish Dish
+     * @return List<DishVO>
      */
     public List<DishVO> listWithFlavor(Dish dish) {
         List<Dish> dishList = dishMapper.list(dish);
diff --git a/sky-server/src/main/resources/mapper/DishMapper.xml b/sky-server/src/main/resources/mapper/DishMapper.xml
index d77e9c7..a8387dd 100644
--- a/sky-server/src/main/resources/mapper/DishMapper.xml
+++ b/sky-server/src/main/resources/mapper/DishMapper.xml
@@ -91,4 +91,21 @@
         from dish
         where id = #{id};
     </select>
+
+    <!-- 条件查询菜品和口味 -->
+    <select id="list" resultType="com.sky.entity.Dish" parameterType="Dish">
+        select * from dish
+        <where>
+            <if test="name != null">
+                and name like concat('%',#{name},'%')
+            </if>
+            <if test="categoryId != null">
+                and category_id = #{categoryId}
+            </if>
+            <if test="status != null">
+                and status = #{status}
+            </if>
+        </where>
+        order by create_time desc
+    </select>
 </mapper>