From b03c4439fc1f66fc1be39df0c3c87fa2c8288d13 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Mon, 16 Dec 2024 22:49:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E5=8E=A2=E6=B7=BB=E5=8A=A0=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E6=95=B0=E6=8D=AE=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canteen/controller/BoxesInfoController.java | 4 +++- .../bsd/pjcloud/canteen/entity/BoxesInfoEntity.java | 3 +++ .../bsd/pjcloud/canteen/service/BoxesInfoService.java | 10 ++++++++++ .../canteen/service/impl/BoxesInfoServiceImpl.java | 7 +++++++ .../src/main/resources/mapper/BoxesInfoMapper.xml | 1 + 5 files changed, 24 insertions(+), 1 deletion(-) diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/BoxesInfoController.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/BoxesInfoController.java index 9df108032..85db428a4 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/BoxesInfoController.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/BoxesInfoController.java @@ -10,6 +10,7 @@ import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.log.annotation.SysLog; import com.bsd.pjcloud.canteen.entity.BoxesInfoEntity; import com.bsd.pjcloud.canteen.service.BoxesInfoService; +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; @@ -50,7 +51,7 @@ public class BoxesInfoController { public R getBoxesInfoPage(@ParameterObject Page page, @ParameterObject BoxesInfoEntity boxesInfo) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); wrapper.eq(StrUtil.isNotBlank(boxesInfo.getName()),BoxesInfoEntity::getName,boxesInfo.getName()); - return R.ok(boxesInfoService.page(page, wrapper)); + return R.ok(boxesInfoService.pageScope(page, wrapper)); } @@ -76,6 +77,7 @@ public class BoxesInfoController { @PostMapping @PreAuthorize("@pms.hasPermission('canteen_boxesInfo_add')" ) public R save(@RequestBody BoxesInfoEntity boxesInfo) { + boxesInfo.setDeptId(SecurityUtils.getUser().getDeptId()); return R.ok(boxesInfoService.save(boxesInfo)); } diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/BoxesInfoEntity.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/BoxesInfoEntity.java index 33a28e9cf..6f592eb89 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/BoxesInfoEntity.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/BoxesInfoEntity.java @@ -110,4 +110,7 @@ public class BoxesInfoEntity extends Model { @TableField(fill = FieldFill.INSERT) @Schema(description="是否删除") private String delFlag; + + @Schema(description="部门id") + private Long deptId; } \ No newline at end of file diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/BoxesInfoService.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/BoxesInfoService.java index 252158660..444401166 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/BoxesInfoService.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/BoxesInfoService.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.BoxesInfoEntity; public interface BoxesInfoService extends IService { + + /** + * 分页查询当前商户的包厢数据 + * @param page + * @param wrapper + * @return + */ + Object pageScope(Page page, LambdaQueryWrapper wrapper); } \ No newline at end of file diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/BoxesInfoServiceImpl.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/BoxesInfoServiceImpl.java index ad9200934..4b296e7b5 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/BoxesInfoServiceImpl.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/BoxesInfoServiceImpl.java @@ -1,9 +1,12 @@ 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.BoxesInfoEntity; import com.bsd.pjcloud.canteen.mapper.BoxesInfoMapper; import com.bsd.pjcloud.canteen.service.BoxesInfoService; +import com.bsd.pjcloud.common.data.datascope.DataScope; import org.springframework.stereotype.Service; /** * 包厢信息 @@ -13,4 +16,8 @@ import org.springframework.stereotype.Service; */ @Service public class BoxesInfoServiceImpl extends ServiceImpl implements BoxesInfoService { + @Override + public Object pageScope(Page page, LambdaQueryWrapper wrapper) { + return baseMapper.selectPageByScope(page,wrapper, DataScope.of()); + } } \ No newline at end of file diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/BoxesInfoMapper.xml b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/BoxesInfoMapper.xml index 41c7f8c2c..a8af58c83 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/BoxesInfoMapper.xml +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/BoxesInfoMapper.xml @@ -18,5 +18,6 @@ + \ No newline at end of file