Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-api-cloud

pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenDailyMenuController.java

@@ -154,7 +154,6 @@ public class CanteenDailyMenuController {
     public R selectFoodList(@RequestParam(value = "spuName",required = false) String skuName) {
         LambdaQueryWrapper<CanteenSpuEntity> wrapper = Wrappers.lambdaQuery();
         wrapper.like(StrUtil.isNotBlank(skuName),CanteenSpuEntity::getName,skuName);
-        wrapper.eq(CanteenSpuEntity::getSystemType,"2");
         return R.ok(canteenSpuService.selectFoodList(wrapper));
     }
 

pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/controller/SmErpSupplierController.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bsd.pjcloud.common.core.util.BeanUtils;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
+import com.bsd.pjcloud.common.security.util.SecurityUtils;
 import com.bsd.pjcloud.erp.vo.SmErpSupplierSimpleVo;
 import com.bsd.pjcloud.supermarketerp.entity.SmErpSupplierEntity;
 import com.bsd.pjcloud.supermarketerp.service.SmErpSupplierService;
@@ -54,7 +55,7 @@ public class SmErpSupplierController {
 		wrapper.like(StrUtil.isNotBlank(smErpSupplier.getSupplierName()),SmErpSupplierEntity::getSupplierName,smErpSupplier.getSupplierName());
 		wrapper.eq(StrUtil.isNotBlank(smErpSupplier.getPhone()),SmErpSupplierEntity::getPhone,smErpSupplier.getPhone());
 		wrapper.like(StrUtil.isNotBlank(smErpSupplier.getLinkName()),SmErpSupplierEntity::getLinkName,smErpSupplier.getLinkName());
-        return R.ok(smErpSupplierService.page(page, wrapper));
+        return R.ok(smErpSupplierService.pageScope(page, wrapper));
     }
 
 
@@ -80,6 +81,7 @@ public class SmErpSupplierController {
     @PostMapping
     @PreAuthorize("@pms.hasPermission('supermarketerp_smErpSupplier_add')" )
     public R save(@RequestBody SmErpSupplierEntity smErpSupplier) {
+        smErpSupplier.setDeptId(SecurityUtils.getUser().getDeptId());
         return R.ok(smErpSupplierService.save(smErpSupplier));
     }
 

pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/service/SmErpSupplierService.java

@@ -1,5 +1,7 @@
 package com.bsd.pjcloud.supermarketerp.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.supermarketerp.entity.SmErpSupplierEntity;
 
@@ -13,4 +15,13 @@ public interface SmErpSupplierService extends IService<SmErpSupplierEntity> {
      * @return
      */
     List<SmErpSupplierEntity> selectSimpleAllScope();
+
+
+    /**
+     * 分页查询
+     * @param page
+     * @param wrapper
+     * @return
+     */
+    Object pageScope(Page page, LambdaQueryWrapper<SmErpSupplierEntity> wrapper);
 }

pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/service/impl/SmErpSupplierServiceImpl.java

@@ -1,6 +1,7 @@
 package com.bsd.pjcloud.supermarketerp.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.common.data.datascope.DataScope;
 import com.bsd.pjcloud.supermarketerp.entity.SmErpSupplierEntity;
@@ -22,4 +23,9 @@ public class SmErpSupplierServiceImpl extends ServiceImpl<SmErpSupplierMapper, S
     public List<SmErpSupplierEntity> selectSimpleAllScope() {
        return baseMapper.selectListByScope(new LambdaQueryWrapper<SmErpSupplierEntity>().eq(SmErpSupplierEntity::getStatus, "0"), DataScope.of());
     }
+
+    @Override
+    public Object pageScope(Page page, LambdaQueryWrapper<SmErpSupplierEntity> wrapper) {
+        return baseMapper.selectPageByScope(page, wrapper, DataScope.of());
+    }
 }