ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/controller/ProductCategoryController.java

@@ -136,7 +136,7 @@ public class ProductCategoryController extends BaseController {
     * 查询产品分类树（排除节点）
     * */
     @GetMapping("/tree/exclude/{excludeIds}")
-    public R<List<Tree<Long>>> listExclude(@PathVariable("excludeIds") String excludeIds,@RequestParam Long platform) {
+    public R<List<Tree<Long>>> listExclude(@PathVariable("excludeIds") String excludeIds,@RequestParam(required = false) Long platform) {
         return R.ok(productCategoryService.queryPageListExclude(excludeIds, platform));
     }
 }

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/service/impl/ProductBaseAuditServiceImpl.java

@@ -225,17 +225,25 @@ public class ProductBaseAuditServiceImpl extends ServiceImpl<ProductBaseAuditMap
             //比较商品编号大小
             String productNo = "";
             if(ObjectUtil.isNotEmpty(base) && ObjectUtil.isNotEmpty(baseAudit)){
-                if(base.getProductNo().compareTo(baseAudit.getProductNo())>0){
-                    productNo = base.getProductNo();
-                }else{
-                    productNo = baseAudit.getProductNo();
+                String baseProductNo = base.getProductNo();
+                String auditProductNo = baseAudit.getProductNo();
+                if(ObjectUtil.isNotEmpty(baseProductNo) && ObjectUtil.isNotEmpty(auditProductNo)){
+                    if(baseProductNo.compareTo(auditProductNo)>0){
+                        productNo = baseProductNo;
+                    }else{
+                        productNo = auditProductNo;
+                    }
+                }else if(ObjectUtil.isNotEmpty(baseProductNo)){
+                    productNo = baseProductNo;
+                }else if(ObjectUtil.isNotEmpty(auditProductNo)){
+                    productNo = auditProductNo;
                 }
             }else if(ObjectUtil.isNotEmpty(base)){
                 productNo = base.getProductNo();
             }else if(ObjectUtil.isNotEmpty(baseAudit)){
                 productNo = baseAudit.getProductNo();
             }
-            productBaseVo.setProductNo(productNo);
+            productBaseVo.setProductNo(NumberGeneratorUtil.generateNumber(productNo));
             add.setProductNo(NumberGeneratorUtil.generateNumber(productNo));
             add.setProductData(JSONObject.toJSONString(productBaseVo));
         }else {