Merge branch 'refs/heads/xiaolu' into master

# Conflicts:
#	ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlatformDataScopeInterceptor.java
#	ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/controller/EnterpriseScaleController.java
#	ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/controller/IndustryCategoryController.java
#	ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/service/impl/SupplierInfoServiceImpl.java
#	ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SupplierLevelController.java
#	ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SupplierTypeController.java
#	ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SupplierTypeVo.java

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlatformDataScopeInterceptor.java

@@ -78,8 +78,10 @@ public class PlatformDataScopeInterceptor implements Interceptor {
         "com_",
         "product_",
         "supplier_level",
+        "industry_category",
         "enterprise_scale",
-        "industry_category"
+        "supplier_contact"
+
 
 
         // 注意：前缀匹配需特殊处理（如 qrtz_），见 isIgnoreTable 方法

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/controller/EnterpriseScaleController.java

@@ -40,7 +40,7 @@ public class EnterpriseScaleController extends BaseController {
     /**
      * 查询企业规模列表
      */
-    //@SaCheckPermission("customer:enterpriseScale:list")
+//    @SaCheckPermission("customer:enterpriseScale:list")
     @GetMapping("/list")
     public TableDataInfo<EnterpriseScaleVo> list(EnterpriseScaleBo bo, PageQuery pageQuery) {
         return enterpriseScaleService.queryPageList(bo, pageQuery);
@@ -57,7 +57,7 @@ public class EnterpriseScaleController extends BaseController {
     /**
      * 导出企业规模列表
      */
-    @SaCheckPermission("customer:enterpriseScale:export")
+//    @SaCheckPermission("customer:enterpriseScale:export")
     @Log(title = "企业规模", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(EnterpriseScaleBo bo, HttpServletResponse response) {
@@ -70,7 +70,7 @@ public class EnterpriseScaleController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("customer:enterpriseScale:query")
+//    @SaCheckPermission("customer:enterpriseScale:query")
     @GetMapping("/{id}")
     public R<EnterpriseScaleVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable("id") Long id) {
@@ -80,7 +80,7 @@ public class EnterpriseScaleController extends BaseController {
     /**
      * 新增企业规模
      */
-    @SaCheckPermission("customer:enterpriseScale:add")
+//    @SaCheckPermission("customer:enterpriseScale:add")
     @Log(title = "企业规模", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -91,7 +91,7 @@ public class EnterpriseScaleController extends BaseController {
     /**
      * 修改企业规模
      */
-    @SaCheckPermission("customer:enterpriseScale:edit")
+//    @SaCheckPermission("customer:enterpriseScale:edit")
     @Log(title = "企业规模", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -104,7 +104,7 @@ public class EnterpriseScaleController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("customer:enterpriseScale:remove")
+//    @SaCheckPermission("customer:enterpriseScale:remove")
     @Log(title = "企业规模", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/controller/IndustryCategoryController.java

@@ -40,7 +40,7 @@ public class IndustryCategoryController extends BaseController {
     /**
      * 查询所属行业列表
      */
-    //@SaCheckPermission("customer:industryCategory:list")
+//    @SaCheckPermission("customer:industryCategory:list")
     @GetMapping("/list")
     public TableDataInfo<IndustryCategoryVo> list(IndustryCategoryBo bo, PageQuery pageQuery) {
         return industryCategoryService.queryPageList(bo, pageQuery);
@@ -57,7 +57,7 @@ public class IndustryCategoryController extends BaseController {
     /**
      * 导出所属行业列表
      */
-    @SaCheckPermission("customer:industryCategory:export")
+//    @SaCheckPermission("customer:industryCategory:export")
     @Log(title = "所属行业", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(IndustryCategoryBo bo, HttpServletResponse response) {
@@ -70,7 +70,7 @@ public class IndustryCategoryController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("customer:industryCategory:query")
+//    @SaCheckPermission("customer:industryCategory:query")
     @GetMapping("/{id}")
     public R<IndustryCategoryVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable("id") Long id) {
@@ -80,7 +80,7 @@ public class IndustryCategoryController extends BaseController {
     /**
      * 新增所属行业
      */
-    @SaCheckPermission("customer:industryCategory:add")
+//    @SaCheckPermission("customer:industryCategory:add")
     @Log(title = "所属行业", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -91,7 +91,7 @@ public class IndustryCategoryController extends BaseController {
     /**
      * 修改所属行业
      */
-    @SaCheckPermission("customer:industryCategory:edit")
+//    @SaCheckPermission("customer:industryCategory:edit")
     @Log(title = "所属行业", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -104,7 +104,7 @@ public class IndustryCategoryController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("customer:industryCategory:remove")
+//    @SaCheckPermission("customer:industryCategory:remove")
     @Log(title = "所属行业", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/controller/SupplierAuthorizeController.java

@@ -74,7 +74,7 @@ public class SupplierAuthorizeController extends BaseController {
     /**
      * 根据供应商ID查询授权详情信息列表
      */
-    @SaCheckPermission("supplier:supplierauthorize:query")
+//    @SaCheckPermission("supplier:supplierauthorize:query")
     @GetMapping("/getAuthorizeDetailList")
     public R<List<SupplierAuthorizeVo>> getAuthorizeDetailList(Long supplierId) {
         return R.ok(supplierAuthorizeService.getAuthorizeDetailList(supplierId));

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/controller/SupplierInfoController.java

@@ -4,6 +4,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
@@ -62,7 +63,7 @@ public class SupplierInfoController extends BaseController {
      */
     @SaCheckPermission("customer:info:list")
     @GetMapping("/getList")
-    public TableDataInfo<SupplierInformationVo> getList(SupplierInfoBo bo, PageQuery pageQuery) {
+    public TableDataInfo<SupplierInfoVo> getList(SupplierInfoBo bo, PageQuery pageQuery) {
         return supplierInfoService.getSupplierInformation(bo, pageQuery);
     }
 
@@ -74,7 +75,7 @@ public class SupplierInfoController extends BaseController {
      */
     @SaCheckPermission("customer:info:list")
     @GetMapping("/getApproveList")
-    public TableDataInfo<SupplierInformationVo> getApproveList(SupplierInfoBo bo, PageQuery pageQuery) {
+    public TableDataInfo<SupplierInfoVo> getApproveList(SupplierInfoBo bo, PageQuery pageQuery) {
 
         return supplierInfoService.getSupplierApproveInformation(bo, pageQuery);
     }
@@ -87,7 +88,10 @@ public class SupplierInfoController extends BaseController {
     @GetMapping("/getSupplierCategories")
     public R<List<String>> getSupplierCategories(@RequestParam Long supplierId) throws JsonProcessingException {
         // 根据供应商ID查询已选择的品目ID列表
-        SupplierInformationVo supplierInfo = supplierInfoService.queryById(supplierId);
+        SupplierInfoVo supplierInfo = supplierInfoService.queryById(supplierId);
+        if (ObjectUtil.isEmpty(supplierInfo) || ObjectUtil.isEmpty(supplierInfo.getOperatingCategory())) {
+            return R.ok(List.of());
+        }
         List<String> collect = Arrays.stream(supplierInfo.getOperatingCategory().split(",")).collect(Collectors.toList());
         //List<String> categoryIds = supplierCategoryService.getCategoryIdsBySupplierId(supplierId);
         return R.ok(collect);
@@ -115,7 +119,7 @@ public class SupplierInfoController extends BaseController {
      */
     @SaCheckPermission("customer:info:query")
     @GetMapping("/{id}")
-    public R<SupplierInformationVo> getInfo(@NotNull(message = "主键不能为空")
+    public R<SupplierInfoVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable("id") Long id) throws JsonProcessingException {
         return R.ok(supplierInfoService.queryById(id));
     }

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/domain/SupplierInfo.java

@@ -44,17 +44,17 @@ public class SupplierInfo extends BaseEntity {
     /**
      * 人员规模
      */
-    private String membershipSize;
+    private Long membershipSize;
 
     /**
      * 供应商类型
      */
-    private String supplierType;
+    private Long supplierType;
 
     /**
      * 合作类型
      */
-    private String cooperationType;
+    private Long cooperationType;
 
     /**
      * 固定电话
@@ -264,7 +264,7 @@ public class SupplierInfo extends BaseEntity {
     /**
      * 所属行业
      */
-    private String industrCategory;
+    private Long industrCategory;
 
     /**
      * 类型（可能与supplier_type重复或细分）
@@ -274,7 +274,7 @@ public class SupplierInfo extends BaseEntity {
     /**
      * 所属公司
      */
-    private String ownedCompany;
+    private Long ownedCompany;
 
     /**
      * 推送状态（0-未推送, 1-已推送...）

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/domain/Supplierapprove.java

@@ -44,17 +44,17 @@ public class Supplierapprove extends TenantEntity {
     /**
      * 企业规模
      */
-    private String membershipSize;
+    private Long membershipSize;
 
     /**
      * 供应商类型
      */
-    private String supplierType;
+    private Long supplierType;
 
     /**
      * 合作类型
      */
-    private String cooperationType;
+    private Long cooperationType;
 
     /**
      * 固定电话
@@ -264,7 +264,7 @@ public class Supplierapprove extends TenantEntity {
     /**
      * 所属行业
      */
-    private String industrCategory;
+    private Long industrCategory;
 
     /**
      * 类型（可能与supplier_type重复或细分）
@@ -274,7 +274,7 @@ public class Supplierapprove extends TenantEntity {
     /**
      * 所属公司
      */
-    private String ownedCompany;
+    private Long ownedCompany;
 
     /**
      * 推送状态（0-未推送, 1-已推送...）

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/domain/bo/SupplierBankBo.java

@@ -20,6 +20,8 @@ import jakarta.validation.constraints.*;
 @AutoMapper(target = SupplierBank.class, reverseConvertGenerate = false)
 public class SupplierBankBo extends BaseEntity {
 
+    private Long id;
+
     /**
      * 账户序号
      */

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/domain/bo/SupplierInfoBo.java

@@ -32,205 +32,205 @@ public class SupplierInfoBo extends BaseEntity {
     /**
      * 供应商编号
      */
-    @NotBlank(message = "供应商编号不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "供应商编号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String supplierNo;
 
     /**
      * 企业名称
      */
-    @NotBlank(message = "企业名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "企业名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String enterpriseName;
 
     /**
      * 人员规模
      */
-    @NotBlank(message = "人员规模不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String membershipSize;
+    //@NotBlank(message = "人员规模不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long membershipSize;
 
     /**
      * 供应商类型
      */
-    @NotBlank(message = "供应商类型不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String supplierType;
+    //@NotBlank(message = "供应商类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long supplierType;
 
     /**
      * 合作类型
      */
-    @NotBlank(message = "合作类型不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String cooperationType;
+    //@NotBlank(message = "合作类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long cooperationType;
 
     /**
      * 固定电话
      */
-    @NotBlank(message = "固定电话不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "固定电话不能为空", groups = { AddGroup.class, EditGroup.class })
     private String fixedPhone;
 
     /**
      * 传真
      */
-    @NotBlank(message = "传真不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "传真不能为空", groups = { AddGroup.class, EditGroup.class })
     private String fax;
 
     /**
      * 网址
      */
-    @NotBlank(message = "网址不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "网址不能为空", groups = { AddGroup.class, EditGroup.class })
     private String url;
 
     /**
      * 邮政编码
      */
-    @NotBlank(message = "邮政编码不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "邮政编码不能为空", groups = { AddGroup.class, EditGroup.class })
     private String postCode;
 
     /**
      * 邮箱
      */
-    @NotBlank(message = "邮箱不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "邮箱不能为空", groups = { AddGroup.class, EditGroup.class })
     private String mailbox;
 
     /**
      * 办公地址-省
      */
-    @NotBlank(message = "办公地址-省不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "办公地址-省不能为空", groups = { AddGroup.class, EditGroup.class })
     private String officeProvince;
 
     /**
      * 办公地址-市
      */
-    @NotBlank(message = "办公地址-市不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "办公地址-市不能为空", groups = { AddGroup.class, EditGroup.class })
     private String officeCity;
 
     /**
      * 办公地址-区/县
      */
-    @NotBlank(message = "办公地址-区/县不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "办公地址-区/县不能为空", groups = { AddGroup.class, EditGroup.class })
     private String officeCounty;
 
     /**
      * 办公详细地址
      */
-    @NotBlank(message = "办公详细地址不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "办公详细地址不能为空", groups = { AddGroup.class, EditGroup.class })
     private String officeAddress;
 
     /**
      * 营业执照名称
      */
-    @NotBlank(message = "营业执照名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "营业执照名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String businessName;
 
     /**
      * 统一社会信用代码
      */
-    @NotBlank(message = "统一社会信用代码不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "统一社会信用代码不能为空", groups = { AddGroup.class, EditGroup.class })
     private String socialCreditCode;
 
     /**
      * 法人姓名
      */
-    @NotBlank(message = "法人姓名不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "法人姓名不能为空", groups = { AddGroup.class, EditGroup.class })
     private String legalPersonName;
 
     /**
      * 法人身份证号
      */
-    @NotBlank(message = "法人身份证号不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "法人身份证号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String legalPersonId;
 
     /**
      * 注册资本
      */
-    @NotBlank(message = "注册资本不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "注册资本不能为空", groups = { AddGroup.class, EditGroup.class })
     private String registeredCapital;
 
     /**
      * 注册地址-省
      */
-    @NotBlank(message = "注册地址-省不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "注册地址-省不能为空", groups = { AddGroup.class, EditGroup.class })
     private String businessProvince;
 
     /**
      * 注册地址-市
      */
-    @NotBlank(message = "注册地址-市不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "注册地址-市不能为空", groups = { AddGroup.class, EditGroup.class })
     private String businessCity;
 
     /**
      * 注册地址-区/县
      */
-    @NotBlank(message = "注册地址-区/县不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "注册地址-区/县不能为空", groups = { AddGroup.class, EditGroup.class })
     private String businessCounty;
 
     /**
      * 注册详细地址
      */
-    @NotBlank(message = "注册详细地址不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "注册详细地址不能为空", groups = { AddGroup.class, EditGroup.class })
     private String businessAddress;
 
     /**
      * 营业执照图片路径
      */
-    @NotBlank(message = "营业执照图片路径不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "营业执照图片路径不能为空", groups = { AddGroup.class, EditGroup.class })
     private String businessLicense;
 
     /**
      * 发票类型
      */
-    @NotBlank(message = "发票类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "发票类型不能为空", groups = { AddGroup.class, EditGroup.class })
     private String invoiceType;
 
     /**
      * 发票抬头
      */
-    @NotBlank(message = "发票抬头不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "发票抬头不能为空", groups = { AddGroup.class, EditGroup.class })
     private String invoiceHeader;
 
     /**
      * 纳税人识别号
      */
-    @NotBlank(message = "纳税人识别号不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "纳税人识别号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String taxpayerIdentifier;
 
     /**
      * 开户银行
      */
-    @NotBlank(message = "开户银行不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "开户银行不能为空", groups = { AddGroup.class, EditGroup.class })
     private String depositaryBank;
 
     /**
      * 行号（可能是银行行号）
      */
-    @NotBlank(message = "行号（可能是银行行号）不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "行号（可能是银行行号）不能为空", groups = { AddGroup.class, EditGroup.class })
     private String rowNum;
 
     /**
      * 银行账号
      */
-    @NotBlank(message = "银行账号不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "银行账号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String bankAccounts;
 
     /**
      * 发票地址
      */
-    @NotBlank(message = "发票地址不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "发票地址不能为空", groups = { AddGroup.class, EditGroup.class })
     private String invoiceAddress;
 
     /**
      * 发票电话
      */
-    @NotBlank(message = "发票电话不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "发票电话不能为空", groups = { AddGroup.class, EditGroup.class })
     private String invoiceLandline;
 
     /**
      * 供货范围
      */
-    @NotBlank(message = "供货范围不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "供货范围不能为空", groups = { AddGroup.class, EditGroup.class })
     private String scopeSupply;
 
     /**
      * 合作方式（0-公开招标, 1-邀请招标...）
      */
-    @NotNull(message = "合作方式（0-公开招标, 1-邀请招标...）不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "合作方式（0-公开招标, 1-邀请招标...）不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long cooperateWay;
 
     /**
@@ -241,7 +241,7 @@ public class SupplierInfoBo extends BaseEntity {
     /**
      * 合同到期时间
      */
-    @NotNull(message = "合同到期时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "合同到期时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date contractEndTime;
 
     /**
@@ -257,107 +257,97 @@ public class SupplierInfoBo extends BaseEntity {
     /**
      * 年销售额
      */
-    @NotNull(message = "年销售额不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "年销售额不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long yearSales;
 
     /**
      * 供应商联系人姓名
      */
-    @NotBlank(message = "供应商联系人姓名不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "供应商联系人姓名不能为空", groups = { AddGroup.class, EditGroup.class })
     private String supplierName;
 
     /**
      * 供应商联系人电话
      */
-    @NotBlank(message = "供应商联系人电话不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "供应商联系人电话不能为空", groups = { AddGroup.class, EditGroup.class })
     private String supplierPhone;
 
     /**
      * 供应商登录密码（已加密）
      */
-    @NotBlank(message = "供应商登录密码（已加密）不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "供应商登录密码（已加密）不能为空", groups = { AddGroup.class, EditGroup.class })
     private String supplierPassword;
 
     /**
      * 经营品类
      */
-    @NotBlank(message = "经营品类不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "经营品类不能为空", groups = { AddGroup.class, EditGroup.class })
     private String operatingCategory;
 
     /**
      * 经营品牌
      */
-    @NotBlank(message = "经营品牌不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "经营品牌不能为空", groups = { AddGroup.class, EditGroup.class })
     private String operatingBrand;
 
     /**
      * 其他客户
      */
-    @NotBlank(message = "其他客户不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "其他客户不能为空", groups = { AddGroup.class, EditGroup.class })
     private String otherCustomers;
 
     /**
      * 简称
      */
-    @NotBlank(message = "简称不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "简称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String shortName;
 
     /**
      * 所属行业
      */
-    @NotBlank(message = "所属行业不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String industrCategory;
+    //@NotBlank(message = "所属行业不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long industrCategory;
 
     /**
      * 类型（可能与supplier_type重复或细分）
      */
-    @NotBlank(message = "类型（可能与supplier_type重复或细分）不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "类型（可能与supplier_type重复或细分）不能为空", groups = { AddGroup.class, EditGroup.class })
     private String type;
 
     /**
      * 所属公司
      */
-    @NotBlank(message = "所属公司不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String ownedCompany;
+    //@NotBlank(message = "所属公司不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long ownedCompany;
 
     /**
      * 推送状态（0-未推送, 1-已推送...）
      */
     private Long pushStatus;
 
-    /**
-     * 创建时间
-     */
-    private Date created;
-
-    /**
-     * 修改时间
-     */
-    @NotNull(message = "修改时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date modify;
 
     /**
      * 有效期开始时间
      */
-    @NotNull(message = "有效期开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "有效期开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date validityFromDate;
 
     /**
      * 有效期结束时间
      */
-    @NotNull(message = "有效期结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "有效期结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date validityToDate;
 
     /**
      * 行号（可能是内部排序或备用字段）
      */
-    @NotNull(message = "行号（可能是内部排序或备用字段）不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "行号（可能是内部排序或备用字段）不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long rowNo;
 
     /**
      * 法人身份证图片路径
      */
-    @NotBlank(message = "法人身份证图片路径不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "法人身份证图片路径不能为空", groups = { AddGroup.class, EditGroup.class })
     private String personImage;
 
     /**
@@ -368,7 +358,7 @@ public class SupplierInfoBo extends BaseEntity {
     /**
      * 是否合作（1-是, 0-否）
      */
-    @NotNull(message = "是否合作（1-是, 0-否）不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "是否合作（1-是, 0-否）不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long cooperative;
 
 

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/domain/bo/SupplierapproveBo.java

@@ -33,7 +33,7 @@ public class SupplierapproveBo extends BaseEntity {
     /**
      * 供应商类型
      */
-    private String supplierType;
+    private Long supplierType;
 
     /**
      * 供货范围

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/domain/vo/SupplierBankVo.java

@@ -28,6 +28,11 @@ public class SupplierBankVo implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 主键
+     */
+    private Long id;
+
     /**
      * 账户序号
      */

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/domain/vo/SupplierInfoVo.java

@@ -15,7 +15,7 @@ import lombok.Data;
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
-
+import java.util.Map;
 
 
 /**
@@ -54,19 +54,19 @@ public class SupplierInfoVo implements Serializable {
      * 人员规模
      */
     @ExcelProperty(value = "人员规模")
-    private String membershipSize;
+    private Long membershipSize;
 
     /**
      * 供应商类型
      */
     @ExcelProperty(value = "供应商类型")
-    private String supplierType;
+    private Long supplierType;
 
     /**
      * 合作类型
      */
     @ExcelProperty(value = "合作类型")
-    private String cooperationType;
+    private Long cooperationType;
 
     /**
      * 固定电话
@@ -322,7 +322,7 @@ public class SupplierInfoVo implements Serializable {
      * 所属行业
      */
     @ExcelProperty(value = "所属行业")
-    private String industrCategory;
+    private Long industrCategory;
 
     /**
      * 类型（可能与supplier_type重复或细分）
@@ -335,7 +335,7 @@ public class SupplierInfoVo implements Serializable {
      * 所属公司
      */
     @ExcelProperty(value = "所属公司")
-    private String ownedCompany;
+    private Long ownedCompany;
 
     /**
      * 推送状态（0-未推送, 1-已推送...）
@@ -344,17 +344,6 @@ public class SupplierInfoVo implements Serializable {
     @ExcelDictFormat(readConverterExp = "0=-未推送,,1=-已推送...")
     private Long pushStatus;
 
-    /**
-     * 创建时间
-     */
-    @ExcelProperty(value = "创建时间")
-    private Date created;
-
-    /**
-     * 修改时间
-     */
-    @ExcelProperty(value = "修改时间")
-    private Date modify;
 
     /**
      * 有效期开始时间
@@ -399,6 +388,28 @@ public class SupplierInfoVo implements Serializable {
     @ExcelDictFormat(readConverterExp = "1=-是,,0=-否")
     private Long cooperative;
 
+    /**
+     * 产品经理
+     */
+    private String productManager;
+
+    /**
+     * 采购员
+     */
+    private String buyer;
+
+    /**
+     * 供应地区（省）
+     */
+    private String province;
+
+    /**
+     * 供应地区（市）
+     */
+    private String city;
+
+    private Map<String,Object> otherCustomersMap;
+
 
     private Date createTime;
 

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/domain/vo/SupplierInformationVo.java

@@ -52,19 +52,19 @@ public class SupplierInformationVo implements Serializable {
      * 人员规模
      */
     @ExcelProperty(value = "人员规模")
-    private String membershipSize;
+    private Long membershipSize;
 
     /**
      * 供应商类型
      */
     @ExcelProperty(value = "供应商类型")
-    private String supplierType;
+    private Long supplierType;
 
     /**
      * 合作类型
      */
     @ExcelProperty(value = "合作类型")
-    private String cooperationType;
+    private Long cooperationType;
 
     /**
      * 工商名称
@@ -191,14 +191,14 @@ public class SupplierInformationVo implements Serializable {
      * 所属行业
      */
     @ExcelProperty(value = "所属行业")
-    private String industrCategory;
+    private Long industrCategory;
 
 
     /**
      * 所属公司
      */
     @ExcelProperty(value = "所属公司")
-    private String ownedCompany;
+    private Long ownedCompany;
 
     /**
      * 推送状态（0-未推送, 1-已推送...）

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/domain/vo/SupplierapproveVo.java

@@ -48,14 +48,14 @@ public class SupplierapproveVo implements Serializable {
      * 企业规模
      */
     @ExcelProperty(value = "企业规模")
-    private String membershipSize;
+    private Long membershipSize;
 
     /**
      * 供应商类型
      */
     @ExcelProperty(value = "供应商类型", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "supplier_type")
-    private String supplierType;
+    private Long supplierType;
 
     /**
      * 经营类目

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/service/ISupplierInfoService.java

@@ -28,7 +28,7 @@ public interface ISupplierInfoService extends IService<SupplierInfo>{
      * @param id 主键
      * @return 供应商信息
      */
-    SupplierInformationVo queryById(Long id) throws JsonProcessingException;
+    SupplierInfoVo queryById(Long id) throws JsonProcessingException;
 
     /**
      * 分页查询供应商信息列表
@@ -46,7 +46,7 @@ public interface ISupplierInfoService extends IService<SupplierInfo>{
      * @return 供应商信息列表
      */
 
-    TableDataInfo<SupplierInformationVo> getSupplierInformation(SupplierInfoBo bo, PageQuery pageQuery);
+    TableDataInfo<SupplierInfoVo> getSupplierInformation(SupplierInfoBo bo, PageQuery pageQuery);
 
     /**
      * 获取供应商审核列表
@@ -54,7 +54,7 @@ public interface ISupplierInfoService extends IService<SupplierInfo>{
      * @param pageQuery
      * @return
      */
-    TableDataInfo<SupplierInformationVo> getSupplierApproveInformation(SupplierInfoBo bo, PageQuery pageQuery);
+    TableDataInfo<SupplierInfoVo> getSupplierApproveInformation(SupplierInfoBo bo, PageQuery pageQuery);
 
     /**
      * 查询符合条件的供应商信息列表

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/service/impl/SupplierInfoServiceImpl.java

@@ -1,5 +1,6 @@
 package org.dromara.customer.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -62,22 +63,13 @@ public class SupplierInfoServiceImpl  extends ServiceImpl<SupplierInfoMapper, Su
      * @return 供应商信息
      */
     @Override
-    public SupplierInformationVo queryById(Long id) throws JsonProcessingException {
+    public SupplierInfoVo queryById(Long id) throws JsonProcessingException {
         SupplierInfoVo supplierInfoVo = baseMapper.selectVoById(id);
-        SupplierInformationVo supplierInformationVo = handleProcurementInfo(supplierInfoVo);
-
-        ObjectMapper  objectMapper = new ObjectMapper();
-        Map<String, Object> originalMap = objectMapper.readValue(supplierInfoVo.getOtherCustomers(), Map.class);
-        // 2. 转换字段名（大写驼峰 -> 小驼峰）
-        Map<String, Object> convertedMap = convertFieldNames(originalMap);
-
-//        Map<String, Object> result = new HashMap<>();
-//        result.put("otherCustomers", convertedMap);
-        supplierInformationVo.setOtherCustomersMap(convertedMap);
+        SupplierInfoVo supplierInformationVo = handleProcurementInfo(supplierInfoVo);
         return supplierInformationVo;
     }
-    private SupplierInformationVo handleProcurementInfo(SupplierInfoVo records) {
-        SupplierInformationVo targetVo = new SupplierInformationVo();
+    private SupplierInfoVo handleProcurementInfo(SupplierInfoVo records) {
+        SupplierInfoVo targetVo = new SupplierInfoVo();
         BeanUtils.copyProperties(records, targetVo, "otherCustomers");
             // 查询管理人员和采购人员
             Long id = targetVo.getId();
@@ -150,11 +142,11 @@ public class SupplierInfoServiceImpl  extends ServiceImpl<SupplierInfoMapper, Su
     }
 
     @Override
-    public TableDataInfo<SupplierInformationVo> getSupplierInformation(SupplierInfoBo bo, PageQuery pageQuery) {
+    public TableDataInfo<SupplierInfoVo> getSupplierInformation(SupplierInfoBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<SupplierInfo> lqw = buildQueryWrapper(bo);
         Page<SupplierInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        List<SupplierInformationVo> supplierInformationVos = handleProcurementInfo(result.getRecords());
-        Page<SupplierInformationVo> newPage = new Page<>();
+        List<SupplierInfoVo> supplierInformationVos = handleProcurementInfo(result.getRecords());
+        Page<SupplierInfoVo> newPage = new Page<>();
         newPage.setRecords(supplierInformationVos);
         newPage.setTotal(result.getTotal());
         newPage.setCurrent(result.getCurrent());
@@ -163,7 +155,7 @@ public class SupplierInfoServiceImpl  extends ServiceImpl<SupplierInfoMapper, Su
     }
 
     @Override
-    public TableDataInfo<SupplierInformationVo> getSupplierApproveInformation(SupplierInfoBo bo, PageQuery pageQuery) {
+    public TableDataInfo<SupplierInfoVo> getSupplierApproveInformation(SupplierInfoBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<SupplierInfo> lqw = buildQueryWrapper(bo);
         if (bo.getSupplyStatus() == null){
             List<Long> status = new ArrayList<>();
@@ -172,8 +164,8 @@ public class SupplierInfoServiceImpl  extends ServiceImpl<SupplierInfoMapper, Su
             lqw.in(SupplierInfo::getSupplyStatus,status);
         }
         Page<SupplierInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        List<SupplierInformationVo> supplierInformationVos = handleProcurementInfo(result.getRecords());
-        Page<SupplierInformationVo> newPage = new Page<>();
+        List<SupplierInfoVo> supplierInformationVos = handleProcurementInfo(result.getRecords());
+        Page<SupplierInfoVo> newPage = new Page<>();
         newPage.setRecords(supplierInformationVos);
         newPage.setTotal(result.getTotal());
         newPage.setCurrent(result.getCurrent());
@@ -184,10 +176,10 @@ public class SupplierInfoServiceImpl  extends ServiceImpl<SupplierInfoMapper, Su
     /**
      * 处理采购员和产品经理信息
      */
-    private List<SupplierInformationVo> handleProcurementInfo(List<SupplierInfoVo> records) {
-        List<SupplierInformationVo> supplierInformationVos = records.stream()
+    private List<SupplierInfoVo> handleProcurementInfo(List<SupplierInfoVo> records) {
+        List<SupplierInfoVo> supplierInformationVos = records.stream()
             .map(supplierInfoVo -> {
-                SupplierInformationVo targetVo = new SupplierInformationVo();
+                SupplierInfoVo targetVo = new SupplierInfoVo();
                 BeanUtils.copyProperties(supplierInfoVo, targetVo);
                 return targetVo;
             })
@@ -199,7 +191,7 @@ public class SupplierInfoServiceImpl  extends ServiceImpl<SupplierInfoMapper, Su
         supplierInformationVos.forEach(vo -> {
             vo.setOperatingCategory(supplierCategoryNameMap.get(vo.getId()));
         });
-        for (SupplierInformationVo vo : supplierInformationVos) {
+        for (SupplierInfoVo vo : supplierInformationVos) {
             // 查询管理人员和采购人员
             Long id = vo.getId();
             LambdaQueryWrapper<SupplierProcurement> procurementLqw = Wrappers.lambdaQuery();
@@ -326,9 +318,9 @@ public class SupplierInfoServiceImpl  extends ServiceImpl<SupplierInfoMapper, Su
         lqw.orderByAsc(SupplierInfo::getId);
         lqw.eq(StringUtils.isNotBlank(bo.getSupplierNo()), SupplierInfo::getSupplierNo, bo.getSupplierNo());
         lqw.like(StringUtils.isNotBlank(bo.getEnterpriseName()), SupplierInfo::getEnterpriseName, bo.getEnterpriseName());
-        lqw.eq(StringUtils.isNotBlank(bo.getMembershipSize()), SupplierInfo::getMembershipSize, bo.getMembershipSize());
-        lqw.eq(StringUtils.isNotBlank(bo.getSupplierType()), SupplierInfo::getSupplierType, bo.getSupplierType());
-        lqw.eq(StringUtils.isNotBlank(bo.getCooperationType()), SupplierInfo::getCooperationType, bo.getCooperationType());
+        lqw.eq(ObjectUtil.isNotEmpty(bo.getMembershipSize()), SupplierInfo::getMembershipSize, bo.getMembershipSize());
+        lqw.eq(ObjectUtil.isNotEmpty(bo.getSupplierType()), SupplierInfo::getSupplierType, bo.getSupplierType());
+        lqw.eq(ObjectUtil.isNotEmpty(bo.getCooperationType()), SupplierInfo::getCooperationType, bo.getCooperationType());
         lqw.eq(StringUtils.isNotBlank(bo.getFixedPhone()), SupplierInfo::getFixedPhone, bo.getFixedPhone());
         lqw.eq(StringUtils.isNotBlank(bo.getFax()), SupplierInfo::getFax, bo.getFax());
         lqw.eq(StringUtils.isNotBlank(bo.getUrl()), SupplierInfo::getUrl, bo.getUrl());
@@ -370,9 +362,9 @@ public class SupplierInfoServiceImpl  extends ServiceImpl<SupplierInfoMapper, Su
         lqw.eq(StringUtils.isNotBlank(bo.getOperatingBrand()), SupplierInfo::getOperatingBrand, bo.getOperatingBrand());
         lqw.eq(StringUtils.isNotBlank(bo.getOtherCustomers()), SupplierInfo::getOtherCustomers, bo.getOtherCustomers());
         lqw.like(StringUtils.isNotBlank(bo.getShortName()), SupplierInfo::getShortName, bo.getShortName());
-        lqw.eq(StringUtils.isNotBlank(bo.getIndustrCategory()), SupplierInfo::getIndustrCategory, bo.getIndustrCategory());
+        lqw.eq(ObjectUtil.isNotEmpty(bo.getIndustrCategory()), SupplierInfo::getIndustrCategory, bo.getIndustrCategory());
         lqw.eq(StringUtils.isNotBlank(bo.getType()), SupplierInfo::getType, bo.getType());
-        lqw.eq(StringUtils.isNotBlank(bo.getOwnedCompany()), SupplierInfo::getOwnedCompany, bo.getOwnedCompany());
+        lqw.eq(ObjectUtil.isNotEmpty(bo.getOwnedCompany()), SupplierInfo::getOwnedCompany, bo.getOwnedCompany());
         lqw.eq(bo.getPushStatus() != null, SupplierInfo::getPushStatus, bo.getPushStatus());
         lqw.eq(bo.getValidityFromDate() != null, SupplierInfo::getValidityFromDate, bo.getValidityFromDate());
         lqw.eq(bo.getValidityToDate() != null, SupplierInfo::getValidityToDate, bo.getValidityToDate());

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/service/impl/SupplierProcurementServiceImpl.java

@@ -1,5 +1,6 @@
 package org.dromara.customer.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
@@ -136,6 +137,12 @@ public class SupplierProcurementServiceImpl  extends ServiceImpl<SupplierProcure
         lqw.eq(SupplierProcurement::getSupplierId,id);
         SupplierProcurement supplierProcurement = baseMapper.selectOne(lqw);
         Map<String,Long> ids = new HashMap<>();
+        if(ObjectUtil.isEmpty(supplierProcurement)){
+            ids.put("productManager",null);
+            ids.put("purchaser",null);
+            return ids;
+        }
+
         ids.put("productManager",supplierProcurement.getProductManager());
         ids.put("purchaser",supplierProcurement.getPurchaser());
         return ids;

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/service/impl/SupplierapproveServiceImpl.java

@@ -1,5 +1,6 @@
 package org.dromara.customer.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
@@ -76,7 +77,7 @@ public class SupplierapproveServiceImpl  extends ServiceImpl<SupplierapproveMapp
         LambdaQueryWrapper<Supplierapprove> lqw = Wrappers.lambdaQuery();
         lqw.orderByAsc(Supplierapprove::getId);
         lqw.like(StringUtils.isNotBlank(bo.getEnterpriseName()), Supplierapprove::getEnterpriseName, bo.getEnterpriseName());
-        lqw.eq(StringUtils.isNotBlank(bo.getSupplierType()), Supplierapprove::getSupplierType, bo.getSupplierType());
+        lqw.eq(ObjectUtil.isNotEmpty(bo.getSupplierType()), Supplierapprove::getSupplierType, bo.getSupplierType());
         lqw.eq(StringUtils.isNotBlank(bo.getScopeSupply()), Supplierapprove::getScopeSupply, bo.getScopeSupply());
         lqw.eq(StringUtils.isNotBlank(bo.getOperatingCategory()), Supplierapprove::getOperatingCategory, bo.getOperatingCategory());
         lqw.eq(StringUtils.isNotBlank(bo.getOperatingBrand()), Supplierapprove::getOperatingBrand, bo.getOperatingBrand());

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/erp/ErpPullController.java

@@ -1,13 +1,11 @@
 package org.dromara.external.controller.erp;
 
+import cn.hutool.core.bean.BeanUtil;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
 import org.dromara.external.api.erp.domain.ErpCompany;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
 
@@ -25,8 +23,15 @@ public class ErpPullController {
     * 同步公司数据（供应商）
     * */
     @PostMapping()
-    public R<Void> erp(@RequestBody Map<String,String> map){
-        System.out.println(map);
+    public R<Void> erp(@RequestParam String type, @RequestBody Map<String,Object> map){
+        if("syncCompany".equals(type)){
+            ErpCompany bean = BeanUtil.toBean(map, ErpCompany.class);
+            this.syncCompany(bean);
+        }
+        if("deleteCompany".equals(type)){
+            ErpCompany bean = BeanUtil.toBean(map, ErpCompany.class);
+            this.deleteCompany(bean);
+        }
         return R.ok();
     }
 

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/dubbo/RemoteCategoryServiceImpl.java

@@ -28,6 +28,9 @@ public class RemoteCategoryServiceImpl implements RemoteCategoryService {
 
         //所有三级品类ID，批量查询
         Set<Long> threeLevelCategoryIds = new HashSet<>(categoryMap.values());
+        if (threeLevelCategoryIds.isEmpty()) {
+            return resultMap;
+        }
         List<ProductCategory> categoryList = categoryMapper.selectList(new LambdaQueryWrapper<ProductCategory>()
             .in(ProductCategory::getId, threeLevelCategoryIds)
             .select(ProductCategory::getId, ProductCategory::getCategoryName, ProductCategory::getAncestors));

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SupplierLevelController.java

@@ -50,7 +50,7 @@ public class SupplierLevelController extends BaseController {
     /**
      * 查询供应商等级列表
      */
-    //@SaCheckPermission("system:level:list")
+//    @SaCheckPermission("system:level:list")
     @GetMapping("/list")
     public TableDataInfo<SupplierLevelVo> list(SupplierLevelBo bo, PageQuery pageQuery) {
         return supplierLevelService.queryPageList(bo, pageQuery);
@@ -59,7 +59,7 @@ public class SupplierLevelController extends BaseController {
     /**
      * 导出供应商等级列表
      */
-    @SaCheckPermission("system:level:export")
+//    @SaCheckPermission("system:level:export")
     @Log(title = "供应商等级", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(SupplierLevelBo bo, HttpServletResponse response) {
@@ -72,7 +72,7 @@ public class SupplierLevelController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("system:level:query")
+//    @SaCheckPermission("system:level:query")
     @GetMapping("/{datasource}/{id}")
     public R<SupplierLevelVo> getInfo(
         @NotNull(message = "主键不能为空") @PathVariable("id") String id,
@@ -89,7 +89,7 @@ public class SupplierLevelController extends BaseController {
     /**
      * TODO 新增供应商等级
      */
-    @SaCheckPermission("system:level:add")
+//    @SaCheckPermission("system:level:add")
     @Log(title = "供应商等级", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -134,7 +134,7 @@ public class SupplierLevelController extends BaseController {
     /**
      * 修改供应商等级
      */
-    @SaCheckPermission("system:level:edit")
+//    @SaCheckPermission("system:level:edit")
     @Log(title = "供应商等级", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -152,7 +152,7 @@ public class SupplierLevelController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("system:level:remove")
+//    @SaCheckPermission("system:level:remove")
     @Log(title = "供应商等级", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SupplierTypeController.java

@@ -49,7 +49,7 @@ public class SupplierTypeController extends BaseController {
     /**
      * 查询供应商类别列表
      */
-    //@SaCheckPermission("system:type:list")
+//    @SaCheckPermission("system:type:list")
     @GetMapping("/list")
     public TableDataInfo<SupplierTypeVo> list(SupplierTypeBo bo, PageQuery pageQuery) {
         return supplierTypeService.queryPageList(bo, pageQuery);
@@ -76,7 +76,7 @@ public class SupplierTypeController extends BaseController {
     /**
      * 导出供应商类别列表
      */
-    @SaCheckPermission("system:type:export")
+//    @SaCheckPermission("system:type:export")
     @Log(title = "供应商类别", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(SupplierTypeBo bo, HttpServletResponse response) {
@@ -89,7 +89,7 @@ public class SupplierTypeController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("system:type:query")
+//    @SaCheckPermission("system:type:query")
     @GetMapping("/{datasource}/{id}")
     public R<SupplierTypeVo> getInfo(
         @NotNull(message = "数据源不能为空") @PathVariable("datasource") String datasource,
@@ -106,7 +106,7 @@ public class SupplierTypeController extends BaseController {
     /**
      * 新增供应商类别
      */
-    @SaCheckPermission("system:type:add")
+//    @SaCheckPermission("system:type:add")
     @Log(title = "供应商类别", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -151,7 +151,7 @@ public class SupplierTypeController extends BaseController {
     /**
      * 修改供应商类别
      */
-    @SaCheckPermission("system:type:edit")
+//    @SaCheckPermission("system:type:edit")
     @Log(title = "供应商类别", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -169,7 +169,7 @@ public class SupplierTypeController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("system:type:remove")
+//    @SaCheckPermission("system:type:remove")
     @Log(title = "供应商类别", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")