Merge branch 'master' of http://124.222.105.7:3000/dianliang/dl_site_system

dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiProdController.java

@@ -126,6 +126,7 @@ public class BusiProdController extends BaseController
                 item.setFileType(FILE_TYPE_PRODUCT);
             });
         }
+        busiProdNewService.setAmount(prodNewVO.getTenantId());
         return success();
     }
 

dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiCategoryServiceImpl.java

@@ -102,14 +102,17 @@ public class BusiCategoryServiceImpl extends ServiceImpl<BusiCategoryMapper, Bus
         }
 
         // 构建树结构（找出根节点）
-        BusiCategory root = null;
+        // 找到所有根节点（parentId为null）
+        List<BusiCategory> roots = new ArrayList<>();
         for (BusiCategory category : categoryList) {
             if (category.getParentId() == null) {
-                root = category;
+                roots.add(category);
             }
         }
-        // 递归统计
-        calculateProdsAll(root, categoryList);
+        // 遍历每个根节点，递归统计
+        for (BusiCategory root : roots) {
+            calculateProdsAll(root, categoryList);
+        }
         return categoryList;
     }