diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/DailyMenuAll.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/DailyMenuAll.java
new file mode 100644
index 000000000..858a0ac49
--- /dev/null
+++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/DailyMenuAll.java
@@ -0,0 +1,24 @@
+package com.bsd.pjcloud.canteen.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author ml
+ * 菜品下拉框主页展示
+ */
+@Data
+public class DailyMenuAll {
+
+    /**
+     * 时间类型
+     */
+    private Integer hourType;
+
+    /**
+     * 菜品信息
+     */
+    private List<DailyMenuVO> dailyMenuVOS;
+
+}
diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/DailyMenuVO.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/DailyMenuVO.java
new file mode 100644
index 000000000..4198149b6
--- /dev/null
+++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/DailyMenuVO.java
@@ -0,0 +1,36 @@
+package com.bsd.pjcloud.canteen.dto;
+
+import lombok.Data;
+
+/**
+ * @author ml
+ * 菜品下拉框
+ */
+@Data
+public class DailyMenuVO {
+
+    /**
+     * 菜品id
+     */
+    private Long id ;
+
+    /**
+     * 每日id
+     */
+    private Long tid ;
+
+    /**
+     * 菜品名称
+     */
+    private String name;
+
+    /**
+     * 菜品封面图
+     */
+    private String picUrl;
+
+    /**
+     * 时间类型
+     */
+    private Integer hourType;
+}
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenCategoryController.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenCategoryController.java
index 7042bee57..1bbb090e0 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenCategoryController.java
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenCategoryController.java
@@ -11,6 +11,7 @@ import com.bsd.pjcloud.canteen.service.CanteenCategoryService;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
+import com.bsd.pjcloud.common.security.util.SecurityUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import org.springdoc.core.annotations.ParameterObject;
@@ -50,7 +51,7 @@ public class CanteenCategoryController {
     public R getCanteenCategoryPage(@ParameterObject Page page, @ParameterObject CanteenCategoryEntity canteenCategory) {
         LambdaQueryWrapper<CanteenCategoryEntity> wrapper = Wrappers.lambdaQuery();
 		wrapper.like(StrUtil.isNotBlank(canteenCategory.getName()),CanteenCategoryEntity::getName,canteenCategory.getName());
-        return R.ok(canteenCategoryService.page(page, wrapper));
+        return R.ok(canteenCategoryService.selectPageByScope(page, wrapper));
     }
 
 
@@ -76,6 +77,7 @@ public class CanteenCategoryController {
     @PostMapping
     @PreAuthorize("@pms.hasPermission('canteen_canteenCategory_add')" )
     public R save(@RequestBody CanteenCategoryEntity canteenCategory) {
+        canteenCategory.setDeptId(SecurityUtils.getUser().getDeptId());
         return R.ok(canteenCategoryService.save(canteenCategory));
     }
 
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenSpuController.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenSpuController.java
index 1a7455160..a6da29476 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenSpuController.java
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenSpuController.java
@@ -3,13 +3,16 @@ package com.bsd.pjcloud.canteen.controller;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.collection.CollUtil;
+import com.alibaba.excel.util.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bsd.pjcloud.canteen.entity.CanteenDailyMenuEntity;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
 import com.bsd.pjcloud.canteen.entity.CanteenSpuEntity;
 import com.bsd.pjcloud.canteen.service.CanteenSpuService;
+import com.bsd.pjcloud.common.security.util.SecurityUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -77,6 +80,7 @@ public class CanteenSpuController {
     @PostMapping
     @PreAuthorize("@pms.hasPermission('canteen_canteenSpu_add')" )
     public R save(@RequestBody CanteenSpuEntity canteenSpu) {
+        canteenSpu.setDeptId(SecurityUtils.getUser().getDeptId());
         return R.ok(canteenSpuService.save(canteenSpu));
     }
 
@@ -119,4 +123,6 @@ public class CanteenSpuController {
     public List<CanteenSpuEntity> export(CanteenSpuEntity canteenSpu,Long[] ids) {
         return canteenSpuService.list(Wrappers.lambdaQuery(canteenSpu).in(ArrayUtil.isNotEmpty(ids), CanteenSpuEntity::getId, ids));
     }
+
+
 }
\ No newline at end of file
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenSpuMapper.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenSpuMapper.java
index de55b62ab..d46219ba0 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenSpuMapper.java
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenSpuMapper.java
@@ -1,11 +1,18 @@
 package com.bsd.pjcloud.canteen.mapper;
 
+import com.bsd.pjcloud.canteen.dto.DailyMenuAll;
+import com.bsd.pjcloud.common.data.datascope.DataScope;
 import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
 import com.bsd.pjcloud.canteen.entity.CanteenSpuEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface CanteenSpuMapper extends PjcloudBaseMapper<CanteenSpuEntity> {
 
 
+
+
+
 }
\ No newline at end of file
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenCategoryService.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenCategoryService.java
index 5f75299b0..e22131df3 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenCategoryService.java
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenCategoryService.java
@@ -1,8 +1,18 @@
 package com.bsd.pjcloud.canteen.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.bsd.pjcloud.canteen.entity.CanteenCategoryEntity;
 
 public interface CanteenCategoryService extends IService<CanteenCategoryEntity> {
 
+
+    /**
+     * 分页获取菜品分类
+     * @param page
+     * @param wrapper
+     * @return
+     */
+    Page<CanteenCategoryEntity> selectPageByScope(Page page, LambdaQueryWrapper<CanteenCategoryEntity> wrapper);
 }
\ No newline at end of file
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenSpuService.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenSpuService.java
index 7eb80b206..8d6239111 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenSpuService.java
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenSpuService.java
@@ -1,8 +1,21 @@
 package com.bsd.pjcloud.canteen.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.bsd.pjcloud.canteen.dto.DailyMenuAll;
 import com.bsd.pjcloud.canteen.entity.CanteenSpuEntity;
 
+import java.util.List;
+
 public interface CanteenSpuService extends IService<CanteenSpuEntity> {
 
+
+    /**
+     * 菜品下拉列表
+     * @param wrapper
+     * @return
+     */
+    Object selectFoodList(LambdaQueryWrapper<CanteenSpuEntity> wrapper);
+
+
 }
\ No newline at end of file
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenCategoryServiceImpl.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenCategoryServiceImpl.java
index c76bbe579..2d446376b 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenCategoryServiceImpl.java
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenCategoryServiceImpl.java
@@ -1,10 +1,17 @@
 package com.bsd.pjcloud.canteen.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.bsd.pjcloud.canteen.entity.CanteenCategoryEntity;
 import com.bsd.pjcloud.canteen.mapper.CanteenCategoryMapper;
 import com.bsd.pjcloud.canteen.service.CanteenCategoryService;
+import com.bsd.pjcloud.common.data.datascope.DataScope;
+import com.bsd.pjcloud.common.security.util.SecurityUtils;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
+
 /**
  * 菜品分类
  *
@@ -13,4 +20,10 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class CanteenCategoryServiceImpl extends ServiceImpl<CanteenCategoryMapper, CanteenCategoryEntity> implements CanteenCategoryService {
+    @Override
+    public Page<CanteenCategoryEntity> selectPageByScope(Page page, LambdaQueryWrapper<CanteenCategoryEntity> wrapper) {
+
+
+        return baseMapper.selectPageByScope(page,wrapper,DataScope.of());
+    }
 }
\ No newline at end of file
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenSpuServiceImpl.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenSpuServiceImpl.java
index 8dfa96ce4..5608e9a82 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenSpuServiceImpl.java
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenSpuServiceImpl.java
@@ -1,10 +1,18 @@
 package com.bsd.pjcloud.canteen.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bsd.pjcloud.canteen.dto.DailyMenuAll;
 import com.bsd.pjcloud.canteen.entity.CanteenSpuEntity;
 import com.bsd.pjcloud.canteen.mapper.CanteenSpuMapper;
 import com.bsd.pjcloud.canteen.service.CanteenSpuService;
+import com.bsd.pjcloud.common.data.datascope.DataScope;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
+
 /**
  * 菜品spu
  *
@@ -13,4 +21,10 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class CanteenSpuServiceImpl extends ServiceImpl<CanteenSpuMapper, CanteenSpuEntity> implements CanteenSpuService {
+    @Override
+    public Object selectFoodList(LambdaQueryWrapper<CanteenSpuEntity> wrapper) {
+        return baseMapper.selectListByScope(wrapper, DataScope.of());
+    }
+
+
 }
\ No newline at end of file
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenSpuMapper.xml b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenSpuMapper.xml
index 4a2b02b44..9da82f375 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenSpuMapper.xml
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenSpuMapper.xml
@@ -32,4 +32,5 @@
         <result property="updateTime" column="update_time"/>
         <result property="tenantId" column="tenant_id"/>
   </resultMap>
+
 </mapper>
\ No newline at end of file