添加deptId等

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/config/DataPermissionConfiguration.java

@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.supplier.config;
+
+import cn.iocoder.yudao.framework.datapermission.core.rule.dept.DeptDataPermissionRuleCustomizer;
+import cn.iocoder.yudao.module.supplier.dal.dataobject.product.SupplierDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * system 模块的数据权限 Configuration
+ *
+ * @author 芋道源码
+ */
+@Configuration(proxyBeanMethods = false)
+public class DataPermissionConfiguration {
+
+    @Bean
+    public DeptDataPermissionRuleCustomizer sysDeptDataPermissionRuleCustomizer() {
+        return rule -> {
+            // dept
+
+            rule.addDeptColumn(SupplierDO.class, "dept_id");
+            // user
+            rule.addUserColumn(SupplierDO.class, "creator");
+        };
+    }
+
+}

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/controller/admin/product/CoreProductController.java

@@ -4,7 +4,10 @@ import cn.iocoder.yudao.module.supplier.controller.admin.product.vo.CoreProductP
 import cn.iocoder.yudao.module.supplier.controller.admin.product.vo.CoreProductRespVO;
 import cn.iocoder.yudao.module.supplier.controller.admin.product.vo.CoreProductSaveReqVO;
 import cn.iocoder.yudao.module.supplier.dal.dataobject.product.CoreProductDO;
+import cn.iocoder.yudao.module.supplier.dal.dataobject.product.ProductDO;
 import cn.iocoder.yudao.module.supplier.service.product.CoreProductService;
+import cn.iocoder.yudao.module.supplier.service.product.ProductServiceImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -13,6 +16,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
 
+import javax.annotation.security.PermitAll;
 import javax.validation.constraints.*;
 import javax.validation.*;
 import javax.servlet.http.*;
@@ -94,4 +98,24 @@ public class CoreProductController {
                         BeanUtils.toBean(list, CoreProductRespVO.class));
     }
 
+
+    @Resource
+    private ProductServiceImpl productService;
+    @GetMapping("/init")
+    @PermitAll
+    public void productAll() {
+        List<ProductDO> all = productService.getAll();
+        List<CoreProductDO> allCoreProduct = coreProductService.getAllCoreProduct();
+        allCoreProduct.forEach(productDO -> {
+            if (StringUtils.isNotBlank(productDO.getProductName())){
+                ProductDO productDO1 = all.stream().filter(e -> e.getName().equals(productDO.getProductName())).findFirst().orElseGet(null);
+                if (Objects.nonNull(productDO1)) {
+                    productDO.setProductId(productDO1.getId());
+                    CoreProductSaveReqVO reqVO = new CoreProductSaveReqVO();
+                    BeanUtils.copyProperties(productDO, reqVO);
+                    coreProductService.updateCoreProduct(reqVO);
+                }
+            }
+        });
+    }
 }

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/controller/admin/product/SupplierController.java

@@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.module.supplier.controller.admin.product.vo.SupplierPageReqVO;
 import cn.iocoder.yudao.module.supplier.controller.admin.product.vo.SupplierRespVO;
@@ -82,6 +83,7 @@ public class SupplierController {
     @GetMapping("/page")
     @Operation(summary = "获得供应商主数据分页")
     @PreAuthorize("@ss.hasPermission('supplier:base:query')")
+    @DataPermission
     public CommonResult<PageResult<SupplierRespVO>> getPage(@Valid SupplierPageReqVO pageReqVO) {
         PageResult<SupplierDO> pageResult = supplierService.getPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, SupplierRespVO.class));

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/controller/admin/product/vo/ProductCategorySaveReqVO.java

@@ -12,8 +12,8 @@ public class ProductCategorySaveReqVO {
     @Schema(description = "分类编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "31217")
     private Long id;
 
-    @Schema(description = "父分类编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "10481")
-    @NotNull(message = "父分类编号不能为空")
+    @Schema(description = "父分类编号")
+    //@NotNull(message = "父分类编号不能为空")
     private Long parentId;
 
     @Schema(description = "分类名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/controller/admin/product/vo/SupplierPageReqVO.java

@@ -74,4 +74,6 @@ public class SupplierPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
+    @Schema(description = "部门id")
+    private Long deptId;
 }

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/controller/admin/product/vo/SupplierRespVO.java

@@ -107,4 +107,6 @@ public class SupplierRespVO {
     @Schema(description = "供应商联系记录列表")
     private List<ConnectRecordRespVO> connectRecords = new ArrayList<>();
 
+    @Schema(description = "部门id")
+    private Long deptId;
 }

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/controller/admin/product/vo/SupplierSaveReqVO.java

@@ -63,4 +63,6 @@ public class SupplierSaveReqVO {
     @Schema(description = "备注", example = "随便")
     private String remark;
 
+    @Schema(description = "部门id")
+    private Long deptId;
 }

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/dal/dataobject/product/SupplierDO.java

@@ -103,4 +103,8 @@ public class SupplierDO extends BaseDO {
      */
     private Integer auditStatus;
 
+    /**
+     * 部门id
+     */
+    private Long deptId;
 }

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/service/product/CoreProductService.java

@@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.supplier.controller.admin.product.vo.CoreProductS
 import cn.iocoder.yudao.module.supplier.dal.dataobject.product.CoreProductDO;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * 供应商核心产品 Service 接口
@@ -52,4 +53,5 @@ public interface CoreProductService {
      */
     PageResult<CoreProductDO> getCoreProductPage(CoreProductPageReqVO pageReqVO);
 
+    List<CoreProductDO> getAllCoreProduct();
 }

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/service/product/CoreProductServiceImpl.java

@@ -72,4 +72,10 @@ public class CoreProductServiceImpl implements CoreProductService {
         return coreProductMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public List<CoreProductDO> getAllCoreProduct() {
+        return coreProductMapper.selectList();
+    }
+
+
 }

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/service/product/SupplierServiceImpl.java

@@ -68,6 +68,8 @@ public class SupplierServiceImpl implements SupplierService {
         supplierDO.setCode("S" + DateUtil.format(new Date(), "yyyyMMddHHmmss") +UUID.randomUUID().toString().substring(0, 3));
         //设置草稿状态
         supplierDO.setStatus(1);
+        Long loginUserDeptId = SecurityFrameworkUtils.getLoginUserDeptId();
+        supplierDO.setDeptId(loginUserDeptId);
         supplierMapper.insert(supplierDO);
         // 返回
         return supplierDO.getId();

yudao-server/src/main/resources/application.yaml

@@ -12,8 +12,8 @@ spring:
   servlet:
     # 文件上传相关配置项
     multipart:
-      max-file-size: 16MB # 单个文件大小
-      max-request-size: 32MB # 设置总上传的文件大小
+      max-file-size: 50MB # 单个文件大小
+      max-request-size: 50MB # 设置总上传的文件大小
 
   # Jackson 配置项
   jackson: