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

@@ -126,8 +126,9 @@ public class PlatformDataScopeInterceptor implements Interceptor {
         "mini_page_set",
         "maintain_info",
         "maintenance_server_item",
-        "ep_",
-        "team_member"
+        "contract_supply",
+        "team_member",
+        "ep_"
         // 注意：前缀匹配需特殊处理（如 qrtz_），见 isIgnoreTable 方法
     ));
 

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

@@ -41,7 +41,7 @@ public class ContractSupplyController extends BaseController {
     /**
      * 查询协议供货列表
      */
-    @SaCheckPermission("supplier:contractsupply:list")
+    //@SaCheckPermission("supplier:contractsupply:list")
     @GetMapping("/list")
     public TableDataInfo<ContractSupplyVo> list(ContractSupplyBo bo, PageQuery pageQuery) {
         return contractSupplyService.queryPageList(bo, pageQuery);
@@ -50,7 +50,7 @@ public class ContractSupplyController extends BaseController {
     /**
      * 导出协议供货列表
      */
-    @SaCheckPermission("supplier:contractsupply:export")
+    //@SaCheckPermission("supplier:contractsupply:export")
     @Log(title = "协议供货", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(ContractSupplyBo bo, HttpServletResponse response) {
@@ -63,7 +63,7 @@ public class ContractSupplyController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("supplier:contractsupply:query")
+    //@SaCheckPermission("supplier:contractsupply:query")
     @GetMapping("/{id}")
     public R<ContractSupplyVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable("id") Long id) {
@@ -74,7 +74,7 @@ public class ContractSupplyController extends BaseController {
     /**
      * 新增协议供货
      */
-    @SaCheckPermission("supplier:contractsupply:add")
+    //@SaCheckPermission("supplier:contractsupply:add")
     @Log(title = "协议供货", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -86,7 +86,7 @@ public class ContractSupplyController extends BaseController {
     /**
      * 修改协议供货
      */
-    @SaCheckPermission("supplier:contractsupply:edit")
+    //@SaCheckPermission("supplier:contractsupply:edit")
     @Log(title = "协议供货", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -112,7 +112,7 @@ public class ContractSupplyController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("supplier:contractsupply:remove")
+    //@SaCheckPermission("supplier:contractsupply:remove")
     @Log(title = "协议供货", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

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

@@ -41,6 +41,12 @@ public class SupplierInfoVo implements Serializable {
     @ExcelProperty(value = "主键ID")
     private Long id;
 
+    /**
+    * supplier_id
+    * */
+    @ExcelProperty(value = "supplier_id")
+    private Long supplierId;
+
     /**
      * 供应商编号
      */

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

@@ -387,6 +387,14 @@ public class SupplierInfoServiceImpl extends ServiceImpl<SupplierInfoMapper, Sup
                 supplierInfo.setId(supplierInfoTemporary.getSupplierId());
                 return baseMapper.updateById(supplierInfo) > 0;
             }
+
+            if(bo.getSupplyStatus() == SupplierStatusEnum.REVIEW_FAILED.getCode()){
+                supplierInfoTemporary.setSupplyStatus(bo.getSupplyStatus());
+                supplierInfoTemporaryService.saveOrUpdate(supplierInfoTemporary);
+                SupplierInfo supplierInfo = BeanUtil.toBean(supplierInfoTemporary, SupplierInfo.class);
+                supplierInfo.setId(supplierInfoTemporary.getSupplierId());
+                return baseMapper.updateById(supplierInfo) > 0;
+            }
         }
 
         SupplierInfo update = MapstructUtils.convert(bo, SupplierInfo.class);

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

@@ -172,6 +172,14 @@ public class SupplierInfoTemporaryServiceImpl  extends ServiceImpl<SupplierInfoT
             new LambdaQueryWrapper<SupplierInfoTemporary>()
             .eq(SupplierInfoTemporary::getSupplierId, bo.getId())
         );
+        //获取供应商编号的最大值
+        SupplierInfoVo supplierInfoVo = supplierInfoMapper.selectVoOne(new LambdaQueryWrapper<SupplierInfo>()
+            .select(SupplierInfo::getSupplierNo)
+            .last("limit 1")
+            .orderByDesc(SupplierInfo::getSupplierNo)
+        );
+        long l = Long.parseLong(supplierInfoVo.getSupplierNo()) + 1;
+        String supplierNo = String.valueOf(l);
         if (supplierInfoTemporary != null) {
             add.setId(supplierInfoTemporary.getId());
             add.setSupplierId(bo.getId());
@@ -184,20 +192,14 @@ public class SupplierInfoTemporaryServiceImpl  extends ServiceImpl<SupplierInfoT
                     add.setSupplierId(supplierInfo.getId());
                 }
             }else{
-                //获取供应商编号的最大值
-                SupplierInfoVo supplierInfoVo = supplierInfoMapper.selectVoOne(new LambdaQueryWrapper<SupplierInfo>()
-                    .select(SupplierInfo::getSupplierNo)
-                    .last("limit 1")
-                    .orderByDesc(SupplierInfo::getSupplierNo)
-                );
-                long l = Long.parseLong(supplierInfoVo.getSupplierNo()) + 1;
-                String supplierNo = String.valueOf(l);
+
                 SupplierInfo supplierInfo = BeanUtil.toBean(add, SupplierInfo.class);
                 supplierInfo.setSupplierNo(supplierNo);
                 supplierInfoMapper.insert(supplierInfo);
                 add.setSupplierId(supplierInfo.getId());
             }
             add.setId(null);
+            add.setSupplierNo(supplierNo);
             add.setSupplyStatus(bo.getSupplyStatus());
             boolean flag = baseMapper.insert(add) > 0;
             if (flag) {