优化结构树查询，注释权限

qomo-kn-cost-manage-start/src/main/resources/application-dev.yml

@@ -15,7 +15,7 @@ v2:
   defaultFormat: .png
 
 server:
-  port: 8082
+  port: 8098
   tomcat:
     max-swallow-size: -1
   error:
@@ -205,10 +205,15 @@ spring:
         # 通过connectProperties属性来打开mergeSql功能；慢SQL记录
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
+#        master:
+#          url: jdbc:mysql://192.168.50.9:2212/selef_report?useUnicode=true&allowMultiQueries=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&serverTimezone=Asia/Shanghai&useSSL=false
+#          username: zzzz
+#          password: knphm2021
+#          driver-class-name: com.mysql.cj.jdbc.Driver
         master:
-          url: jdbc:mysql://192.168.50.9:2212/selef_report?useUnicode=true&allowMultiQueries=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&serverTimezone=Asia/Shanghai&useSSL=false
+          url: jdbc:mysql://158.158.4.51:13306/kn_otd_app?useUnicode=true&allowMultiQueries=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&serverTimezone=Asia/Shanghai&useSSL=false
-          username: zzzz
+          username: knotd
-          password: knphm2021
+          password: otd@2024
           driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置
           #multi-datasource1:

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/AppSceneCostCountController.java

@@ -79,7 +79,7 @@ public class AppSceneCostCountController extends JeecgController<AppSceneCostCou
      */
     @AutoLog(value = "app_scene_cost_count-添加")
     @ApiOperation(value = "添加标准成本计算任务", notes = "添加标准成本计算任务")
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_count:addCostCountTask")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_count:addCostCountTask")
     @PostMapping(value = "/addCostCountTask")
     public Result<String> addCostCountTask(@RequestBody AppSceneCostCount appSceneCostCount) {
         appSceneCostCountService.addCostCountTask(appSceneCostCount);
@@ -95,7 +95,7 @@ public class AppSceneCostCountController extends JeecgController<AppSceneCostCou
      */
     @AutoLog(value = "app_scene_cost_count-通过id删除")
     @ApiOperation(value = "标准成本计算-通过id删除", notes = "标准成本计算-通过id删除")
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_count:delete")
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_count:delete")
     @DeleteMapping(value = "/delete")
     public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
         appSceneCostCountService.removeById(id);
@@ -110,7 +110,7 @@ public class AppSceneCostCountController extends JeecgController<AppSceneCostCou
 //     */
 //    @AutoLog(value = "app_scene_cost_count-批量删除")
 //    @ApiOperation(value = "app_scene_cost_count-批量删除", notes = "app_scene_cost_count-批量删除")
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_count:deleteBatch")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_count:deleteBatch")
 //    @DeleteMapping(value = "/deleteBatch")
 //    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
 //        this.appSceneCostCountService.removeByIds(Arrays.asList(ids.split(",")));
@@ -157,7 +157,7 @@ public class AppSceneCostCountController extends JeecgController<AppSceneCostCou
      * @param request
      * @param appSceneCostCount
      */
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_count:exportXls")
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_count:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, AppSceneCostCount appSceneCostCount) {
         return super.exportXls(request, appSceneCostCount, AppSceneCostCount.class, "app_scene_cost_count");
@@ -170,7 +170,7 @@ public class AppSceneCostCountController extends JeecgController<AppSceneCostCou
      * @param response
      * @return
      */
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_count:importExcel")
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_count:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, AppSceneCostCount.class);

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/AppSceneCostHourRateController.java

@@ -65,7 +65,7 @@ public class AppSceneCostHourRateController extends JeecgController<AppSceneCost
      */
     @AutoLog(value = "app_scene_cost_hour_rate-添加")
     @ApiOperation(value = "app_scene_cost_hour_rate-添加", notes = "app_scene_cost_hour_rate-添加")
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_hour_rate:add")
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_hour_rate:add")
     @PostMapping(value = "/add")
     public Result<String> add(@RequestBody AppSceneCostHourRate appSceneCostHourRate) {
         appSceneCostHourRateService.save(appSceneCostHourRate);
@@ -80,7 +80,7 @@ public class AppSceneCostHourRateController extends JeecgController<AppSceneCost
      */
     @AutoLog(value = "app_scene_cost_hour_rate-编辑")
     @ApiOperation(value = "app_scene_cost_hour_rate-编辑", notes = "app_scene_cost_hour_rate-编辑")
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_hour_rate:edit")
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_hour_rate:edit")
     @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
     public Result<String> edit(@RequestBody AppSceneCostHourRate appSceneCostHourRate) {
         appSceneCostHourRateService.updateById(appSceneCostHourRate);
@@ -95,7 +95,7 @@ public class AppSceneCostHourRateController extends JeecgController<AppSceneCost
      */
     @AutoLog(value = "app_scene_cost_hour_rate-通过id删除")
     @ApiOperation(value = "app_scene_cost_hour_rate-通过id删除", notes = "app_scene_cost_hour_rate-通过id删除")
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_hour_rate:delete")
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_hour_rate:delete")
     @DeleteMapping(value = "/delete")
     public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
         appSceneCostHourRateService.removeById(id);
@@ -110,7 +110,7 @@ public class AppSceneCostHourRateController extends JeecgController<AppSceneCost
 //     */
 //    @AutoLog(value = "app_scene_cost_hour_rate-批量删除")
 //    @ApiOperation(value = "app_scene_cost_hour_rate-批量删除", notes = "app_scene_cost_hour_rate-批量删除")
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_hour_rate:deleteBatch")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_hour_rate:deleteBatch")
 //    @DeleteMapping(value = "/deleteBatch")
 //    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
 //        this.appSceneCostHourRateService.removeByIds(Arrays.asList(ids.split(",")));
@@ -140,7 +140,7 @@ public class AppSceneCostHourRateController extends JeecgController<AppSceneCost
 //     * @param request
 //     * @param appSceneCostHourRate
 //     */
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_hour_rate:exportXls")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_hour_rate:exportXls")
 //    @RequestMapping(value = "/exportXls")
 //    public ModelAndView exportXls(HttpServletRequest request, AppSceneCostHourRate appSceneCostHourRate) {
 //        return super.exportXls(request, appSceneCostHourRate, AppSceneCostHourRate.class, "app_scene_cost_hour_rate");
@@ -153,7 +153,7 @@ public class AppSceneCostHourRateController extends JeecgController<AppSceneCost
 //     * @param response
 //     * @return
 //     */
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_hour_rate:importExcel")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_hour_rate:importExcel")
 //    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
 //    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
 //        return super.importExcel(request, response, AppSceneCostHourRate.class);

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/AppSceneCostMaterialBomController.java

@@ -93,7 +93,7 @@ public class AppSceneCostMaterialBomController extends JeecgController<AppSceneC
 //     */
 //    @AutoLog(value = "app_scene_cost_material_bom-添加")
 //    @ApiOperation(value = "app_scene_cost_material_bom-添加", notes = "app_scene_cost_material_bom-添加")
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_bom:add")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_bom:add")
 //    @PostMapping(value = "/add")
 //    public Result<String> add(@RequestBody AppSceneCostMaterialBom appSceneCostMaterialBom) {
 //        appSceneCostMaterialBomService.save(appSceneCostMaterialBom);
@@ -108,7 +108,7 @@ public class AppSceneCostMaterialBomController extends JeecgController<AppSceneC
 //     */
 //    @AutoLog(value = "app_scene_cost_material_bom-编辑")
 //    @ApiOperation(value = "app_scene_cost_material_bom-编辑", notes = "app_scene_cost_material_bom-编辑")
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_bom:edit")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_bom:edit")
 //    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
 //    public Result<String> edit(@RequestBody AppSceneCostMaterialBom appSceneCostMaterialBom) {
 //        appSceneCostMaterialBomService.updateById(appSceneCostMaterialBom);
@@ -123,7 +123,7 @@ public class AppSceneCostMaterialBomController extends JeecgController<AppSceneC
 //     */
 //    @AutoLog(value = "app_scene_cost_material_bom-通过id删除")
 //    @ApiOperation(value = "app_scene_cost_material_bom-通过id删除", notes = "app_scene_cost_material_bom-通过id删除")
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_bom:delete")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_bom:delete")
 //    @DeleteMapping(value = "/delete")
 //    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
 //        appSceneCostMaterialBomService.removeById(id);
@@ -138,7 +138,7 @@ public class AppSceneCostMaterialBomController extends JeecgController<AppSceneC
 //     */
 //    @AutoLog(value = "app_scene_cost_material_bom-批量删除")
 //    @ApiOperation(value = "app_scene_cost_material_bom-批量删除", notes = "app_scene_cost_material_bom-批量删除")
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_bom:deleteBatch")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_bom:deleteBatch")
 //    @DeleteMapping(value = "/deleteBatch")
 //    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
 //        this.appSceneCostMaterialBomService.removeByIds(Arrays.asList(ids.split(",")));
@@ -168,7 +168,7 @@ public class AppSceneCostMaterialBomController extends JeecgController<AppSceneC
 //     * @param request
 //     * @param appSceneCostMaterialBom
 //     */
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_bom:exportXls")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_bom:exportXls")
 //    @RequestMapping(value = "/exportXls")
 //    public ModelAndView exportXls(HttpServletRequest request, AppSceneCostMaterialBom appSceneCostMaterialBom) {
 //        return super.exportXls(request, appSceneCostMaterialBom, AppSceneCostMaterialBom.class, "app_scene_cost_material_bom");
@@ -181,7 +181,7 @@ public class AppSceneCostMaterialBomController extends JeecgController<AppSceneC
 //     * @param response
 //     * @return
 //     */
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_bom:importExcel")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_bom:importExcel")
 //    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
 //    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
 //        return super.importExcel(request, response, AppSceneCostMaterialBom.class);

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/AppSceneCostMaterialProcessHoursController.java

@@ -62,7 +62,7 @@ public class AppSceneCostMaterialProcessHoursController extends JeecgController<
      */
     @AutoLog(value = "app_scene_cost_material_process_hours-添加")
     @ApiOperation(value = "app_scene_cost_material_process_hours-添加", notes = "app_scene_cost_material_process_hours-添加")
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_process_hours:add")
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_process_hours:add")
     @PostMapping(value = "/add")
     public Result<String> add(@RequestBody AppSceneCostMaterialProcessHours appSceneCostMaterialProcessHours) {
         appSceneCostMaterialProcessHoursService.save(appSceneCostMaterialProcessHours);
@@ -77,7 +77,7 @@ public class AppSceneCostMaterialProcessHoursController extends JeecgController<
      */
     @AutoLog(value = "app_scene_cost_material_process_hours-编辑")
     @ApiOperation(value = "app_scene_cost_material_process_hours-编辑", notes = "app_scene_cost_material_process_hours-编辑")
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_process_hours:edit")
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_process_hours:edit")
     @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
     public Result<String> edit(@RequestBody AppSceneCostMaterialProcessHours appSceneCostMaterialProcessHours) {
         appSceneCostMaterialProcessHoursService.updateById(appSceneCostMaterialProcessHours);
@@ -92,7 +92,7 @@ public class AppSceneCostMaterialProcessHoursController extends JeecgController<
      */
     @AutoLog(value = "app_scene_cost_material_process_hours-通过id删除")
     @ApiOperation(value = "app_scene_cost_material_process_hours-通过id删除", notes = "app_scene_cost_material_process_hours-通过id删除")
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_process_hours:delete")
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_process_hours:delete")
     @DeleteMapping(value = "/delete")
     public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
         appSceneCostMaterialProcessHoursService.removeById(id);
@@ -107,7 +107,7 @@ public class AppSceneCostMaterialProcessHoursController extends JeecgController<
 //     */
 //    @AutoLog(value = "app_scene_cost_material_process_hours-批量删除")
 //    @ApiOperation(value = "app_scene_cost_material_process_hours-批量删除", notes = "app_scene_cost_material_process_hours-批量删除")
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_process_hours:deleteBatch")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_process_hours:deleteBatch")
 //    @DeleteMapping(value = "/deleteBatch")
 //    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
 //        this.appSceneCostMaterialProcessHoursService.removeByIds(Arrays.asList(ids.split(",")));
@@ -137,7 +137,7 @@ public class AppSceneCostMaterialProcessHoursController extends JeecgController<
 //     * @param request
 //     * @param appSceneCostMaterialProcessHours
 //     */
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_process_hours:exportXls")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_process_hours:exportXls")
 //    @RequestMapping(value = "/exportXls")
 //    public ModelAndView exportXls(HttpServletRequest request, AppSceneCostMaterialProcessHours appSceneCostMaterialProcessHours) {
 //        return super.exportXls(request, appSceneCostMaterialProcessHours, AppSceneCostMaterialProcessHours.class, "app_scene_cost_material_process_hours");
@@ -150,7 +150,7 @@ public class AppSceneCostMaterialProcessHoursController extends JeecgController<
 //     * @param response
 //     * @return
 //     */
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_process_hours:importExcel")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_process_hours:importExcel")
 //    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
 //    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
 //        return super.importExcel(request, response, AppSceneCostMaterialProcessHours.class);

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/AppSceneCostPartMissingInfoController.java

@@ -62,7 +62,7 @@ public class AppSceneCostPartMissingInfoController extends JeecgController<AppSc
 //     */
 //    @AutoLog(value = "app_scene_cost_part_missing_info-添加")
 //    @ApiOperation(value = "app_scene_cost_part_missing_info-添加", notes = "app_scene_cost_part_missing_info-添加")
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_part_missing_info:add")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_part_missing_info:add")
 //    @PostMapping(value = "/add")
 //    public Result<String> add(@RequestBody AppSceneCostPartMissingInfo appSceneCostPartMissingInfo) {
 //        appSceneCostPartMissingInfoService.save(appSceneCostPartMissingInfo);
@@ -77,7 +77,7 @@ public class AppSceneCostPartMissingInfoController extends JeecgController<AppSc
 //     */
 //    @AutoLog(value = "app_scene_cost_part_missing_info-编辑")
 //    @ApiOperation(value = "app_scene_cost_part_missing_info-编辑", notes = "app_scene_cost_part_missing_info-编辑")
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_part_missing_info:edit")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_part_missing_info:edit")
 //    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
 //    public Result<String> edit(@RequestBody AppSceneCostPartMissingInfo appSceneCostPartMissingInfo) {
 //        appSceneCostPartMissingInfoService.updateById(appSceneCostPartMissingInfo);
@@ -92,7 +92,7 @@ public class AppSceneCostPartMissingInfoController extends JeecgController<AppSc
 //     */
 //    @AutoLog(value = "app_scene_cost_part_missing_info-通过id删除")
 //    @ApiOperation(value = "app_scene_cost_part_missing_info-通过id删除", notes = "app_scene_cost_part_missing_info-通过id删除")
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_part_missing_info:delete")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_part_missing_info:delete")
 //    @DeleteMapping(value = "/delete")
 //    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
 //        appSceneCostPartMissingInfoService.removeById(id);
@@ -107,7 +107,7 @@ public class AppSceneCostPartMissingInfoController extends JeecgController<AppSc
 //     */
 //    @AutoLog(value = "app_scene_cost_part_missing_info-批量删除")
 //    @ApiOperation(value = "app_scene_cost_part_missing_info-批量删除", notes = "app_scene_cost_part_missing_info-批量删除")
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_part_missing_info:deleteBatch")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_part_missing_info:deleteBatch")
 //    @DeleteMapping(value = "/deleteBatch")
 //    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
 //        this.appSceneCostPartMissingInfoService.removeByIds(Arrays.asList(ids.split(",")));
@@ -137,7 +137,7 @@ public class AppSceneCostPartMissingInfoController extends JeecgController<AppSc
 //     * @param request
 //     * @param appSceneCostPartMissingInfo
 //     */
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_part_missing_info:exportXls")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_part_missing_info:exportXls")
 //    @RequestMapping(value = "/exportXls")
 //    public ModelAndView exportXls(HttpServletRequest request, AppSceneCostPartMissingInfo appSceneCostPartMissingInfo) {
 //        return super.exportXls(request, appSceneCostPartMissingInfo, AppSceneCostPartMissingInfo.class, "app_scene_cost_part_missing_info");
@@ -150,7 +150,7 @@ public class AppSceneCostPartMissingInfoController extends JeecgController<AppSc
 //     * @param response
 //     * @return
 //     */
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_part_missing_info:importExcel")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_part_missing_info:importExcel")
 //    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
 //    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
 //        return super.importExcel(request, response, AppSceneCostPartMissingInfo.class);

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/AppSceneCostPurchaseEvaluateController.java

@@ -65,7 +65,7 @@ public class AppSceneCostPurchaseEvaluateController extends JeecgController<AppS
      */
     @AutoLog(value = "app_scene_cost_purchase_evaluate-添加")
     @ApiOperation(value = "app_scene_cost_purchase_evaluate-添加", notes = "app_scene_cost_purchase_evaluate-添加")
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_evaluate:add")
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_evaluate:add")
     @PostMapping(value = "/add")
     public Result<String> add(@RequestBody AppSceneCostPurchaseEvaluate appSceneCostPurchaseEvaluate) {
         appSceneCostPurchaseEvaluateService.save(appSceneCostPurchaseEvaluate);
@@ -80,7 +80,7 @@ public class AppSceneCostPurchaseEvaluateController extends JeecgController<AppS
      */
     @AutoLog(value = "app_scene_cost_purchase_evaluate-编辑")
     @ApiOperation(value = "app_scene_cost_purchase_evaluate-编辑", notes = "app_scene_cost_purchase_evaluate-编辑")
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_evaluate:edit")
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_evaluate:edit")
     @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
     public Result<String> edit(@RequestBody AppSceneCostPurchaseEvaluate appSceneCostPurchaseEvaluate) {
         appSceneCostPurchaseEvaluateService.updateById(appSceneCostPurchaseEvaluate);
@@ -95,7 +95,7 @@ public class AppSceneCostPurchaseEvaluateController extends JeecgController<AppS
      */
     @AutoLog(value = "app_scene_cost_purchase_evaluate-通过id删除")
     @ApiOperation(value = "app_scene_cost_purchase_evaluate-通过id删除", notes = "app_scene_cost_purchase_evaluate-通过id删除")
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_evaluate:delete")
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_evaluate:delete")
     @DeleteMapping(value = "/delete")
     public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
         appSceneCostPurchaseEvaluateService.removeById(id);
@@ -110,7 +110,7 @@ public class AppSceneCostPurchaseEvaluateController extends JeecgController<AppS
 //     */
 //    @AutoLog(value = "app_scene_cost_purchase_evaluate-批量删除")
 //    @ApiOperation(value = "app_scene_cost_purchase_evaluate-批量删除", notes = "app_scene_cost_purchase_evaluate-批量删除")
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_evaluate:deleteBatch")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_evaluate:deleteBatch")
 //    @DeleteMapping(value = "/deleteBatch")
 //    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
 //        this.appSceneCostPurchaseEvaluateService.removeByIds(Arrays.asList(ids.split(",")));
@@ -140,7 +140,7 @@ public class AppSceneCostPurchaseEvaluateController extends JeecgController<AppS
 //     * @param request
 //     * @param appSceneCostPurchaseEvaluate
 //     */
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_evaluate:exportXls")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_evaluate:exportXls")
 //    @RequestMapping(value = "/exportXls")
 //    public ModelAndView exportXls(HttpServletRequest request, AppSceneCostPurchaseEvaluate appSceneCostPurchaseEvaluate) {
 //        return super.exportXls(request, appSceneCostPurchaseEvaluate, AppSceneCostPurchaseEvaluate.class, "app_scene_cost_purchase_evaluate");
@@ -153,7 +153,7 @@ public class AppSceneCostPurchaseEvaluateController extends JeecgController<AppS
 //     * @param response
 //     * @return
 //     */
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_evaluate:importExcel")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_evaluate:importExcel")
 //    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
 //    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
 //        return super.importExcel(request, response, AppSceneCostPurchaseEvaluate.class);

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/AppSceneCostPurchasePriceController.java

@@ -62,7 +62,7 @@ public class AppSceneCostPurchasePriceController extends JeecgController<AppScen
      */
     @AutoLog(value = "app_scene_cost_purchase_price-添加")
     @ApiOperation(value = "app_scene_cost_purchase_price-添加", notes = "app_scene_cost_purchase_price-添加")
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_price:add")
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_price:add")
     @PostMapping(value = "/add")
     public Result<String> add(@RequestBody AppSceneCostPurchasePrice appSceneCostPurchasePrice) {
         appSceneCostPurchasePriceService.save(appSceneCostPurchasePrice);
@@ -77,7 +77,7 @@ public class AppSceneCostPurchasePriceController extends JeecgController<AppScen
      */
     @AutoLog(value = "app_scene_cost_purchase_price-编辑")
     @ApiOperation(value = "app_scene_cost_purchase_price-编辑", notes = "app_scene_cost_purchase_price-编辑")
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_price:edit")
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_price:edit")
     @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
     public Result<String> edit(@RequestBody AppSceneCostPurchasePrice appSceneCostPurchasePrice) {
         appSceneCostPurchasePriceService.updateById(appSceneCostPurchasePrice);
@@ -92,7 +92,7 @@ public class AppSceneCostPurchasePriceController extends JeecgController<AppScen
      */
     @AutoLog(value = "app_scene_cost_purchase_price-通过id删除")
     @ApiOperation(value = "app_scene_cost_purchase_price-通过id删除", notes = "app_scene_cost_purchase_price-通过id删除")
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_price:delete")
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_price:delete")
     @DeleteMapping(value = "/delete")
     public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
         appSceneCostPurchasePriceService.removeById(id);
@@ -107,7 +107,7 @@ public class AppSceneCostPurchasePriceController extends JeecgController<AppScen
      */
     @AutoLog(value = "app_scene_cost_purchase_price-批量删除")
     @ApiOperation(value = "app_scene_cost_purchase_price-批量删除", notes = "app_scene_cost_purchase_price-批量删除")
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_price:deleteBatch")
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_price:deleteBatch")
     @DeleteMapping(value = "/deleteBatch")
     public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
         this.appSceneCostPurchasePriceService.removeByIds(Arrays.asList(ids.split(",")));
@@ -137,7 +137,7 @@ public class AppSceneCostPurchasePriceController extends JeecgController<AppScen
      * @param request
      * @param appSceneCostPurchasePrice
      */
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_price:exportXls")
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_price:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, AppSceneCostPurchasePrice appSceneCostPurchasePrice) {
         return super.exportXls(request, appSceneCostPurchasePrice, AppSceneCostPurchasePrice.class, "app_scene_cost_purchase_price");
@@ -150,7 +150,7 @@ public class AppSceneCostPurchasePriceController extends JeecgController<AppScen
      * @param response
      * @return
      */
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_price:importExcel")
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_price:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, AppSceneCostPurchasePrice.class);

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/AppSceneCostResultValueController.java

@@ -157,7 +157,7 @@ public class AppSceneCostResultValueController extends JeecgController<AppSceneC
     * @param request
     * @param appSceneCostResultValue
     */
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_result_value:exportXls")
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_result_value:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, AppSceneCostResultValue appSceneCostResultValue) {
         return super.exportXls(request, appSceneCostResultValue, AppSceneCostResultValue.class, "app_scene_cost_result_value");
@@ -170,7 +170,7 @@ public class AppSceneCostResultValueController extends JeecgController<AppSceneC
     * @param response
     * @return
     */
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_result_value:importExcel")
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_result_value:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, AppSceneCostResultValue.class);

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/AppSceneCostStandardDetailController.java

@@ -62,7 +62,7 @@ public class AppSceneCostStandardDetailController extends JeecgController<AppSce
 //     */
 //    @AutoLog(value = "app_scene_cost_standard_detail-添加")
 //    @ApiOperation(value = "app_scene_cost_standard_detail-添加", notes = "app_scene_cost_standard_detail-添加")
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_detail:add")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_detail:add")
 //    @PostMapping(value = "/add")
 //    public Result<String> add(@RequestBody AppSceneCostStandardDetail appSceneCostStandardDetail) {
 //        appSceneCostStandardDetailService.save(appSceneCostStandardDetail);
@@ -77,7 +77,7 @@ public class AppSceneCostStandardDetailController extends JeecgController<AppSce
 //     */
 //    @AutoLog(value = "app_scene_cost_standard_detail-编辑")
 //    @ApiOperation(value = "app_scene_cost_standard_detail-编辑", notes = "app_scene_cost_standard_detail-编辑")
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_detail:edit")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_detail:edit")
 //    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
 //    public Result<String> edit(@RequestBody AppSceneCostStandardDetail appSceneCostStandardDetail) {
 //        appSceneCostStandardDetailService.updateById(appSceneCostStandardDetail);
@@ -92,7 +92,7 @@ public class AppSceneCostStandardDetailController extends JeecgController<AppSce
 //     */
 //    @AutoLog(value = "app_scene_cost_standard_detail-通过id删除")
 //    @ApiOperation(value = "app_scene_cost_standard_detail-通过id删除", notes = "app_scene_cost_standard_detail-通过id删除")
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_detail:delete")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_detail:delete")
 //    @DeleteMapping(value = "/delete")
 //    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
 //        appSceneCostStandardDetailService.removeById(id);
@@ -107,7 +107,7 @@ public class AppSceneCostStandardDetailController extends JeecgController<AppSce
 //     */
 //    @AutoLog(value = "app_scene_cost_standard_detail-批量删除")
 //    @ApiOperation(value = "app_scene_cost_standard_detail-批量删除", notes = "app_scene_cost_standard_detail-批量删除")
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_detail:deleteBatch")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_detail:deleteBatch")
 //    @DeleteMapping(value = "/deleteBatch")
 //    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
 //        this.appSceneCostStandardDetailService.removeByIds(Arrays.asList(ids.split(",")));
@@ -137,7 +137,7 @@ public class AppSceneCostStandardDetailController extends JeecgController<AppSce
      * @param request
      * @param appSceneCostStandardDetail
      */
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_detail:exportXls")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_detail:exportXls")
     @RequestMapping(value = "/exportXls")
     @ApiOperation(value = "cost-单行查询导出", notes = "cost-单行查询导出")
     public ModelAndView exportXls(HttpServletRequest request, AppSceneCostStandardDetail appSceneCostStandardDetail) {
@@ -151,7 +151,7 @@ public class AppSceneCostStandardDetailController extends JeecgController<AppSce
 //     * @param response
 //     * @return
 //     */
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_detail:importExcel")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_detail:importExcel")
 //    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
 //    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
 //        return super.importExcel(request, response, AppSceneCostStandardDetail.class);

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/AppSceneCostStandardVersionController.java

@@ -60,7 +60,7 @@ public class AppSceneCostStandardVersionController extends JeecgController<AppSc
 //     */
 //    @AutoLog(value = "app_scene_cost_standard_version-添加")
 //    @ApiOperation(value = "app_scene_cost_standard_version-添加", notes = "app_scene_cost_standard_version-添加")
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_version:add")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_version:add")
 //    @PostMapping(value = "/add")
 //    public Result<String> add(@RequestBody AppSceneCostStandardVersion appSceneCostStandardVersion) {
 //        appSceneCostStandardVersionService.save(appSceneCostStandardVersion);
@@ -75,7 +75,7 @@ public class AppSceneCostStandardVersionController extends JeecgController<AppSc
 //     */
 //    @AutoLog(value = "app_scene_cost_standard_version-编辑")
 //    @ApiOperation(value = "app_scene_cost_standard_version-编辑", notes = "app_scene_cost_standard_version-编辑")
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_version:edit")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_version:edit")
 //    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
 //    public Result<String> edit(@RequestBody AppSceneCostStandardVersion appSceneCostStandardVersion) {
 //        appSceneCostStandardVersionService.updateById(appSceneCostStandardVersion);
@@ -90,7 +90,7 @@ public class AppSceneCostStandardVersionController extends JeecgController<AppSc
 //     */
 //    @AutoLog(value = "app_scene_cost_standard_version-通过id删除")
 //    @ApiOperation(value = "app_scene_cost_standard_version-通过id删除", notes = "app_scene_cost_standard_version-通过id删除")
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_version:delete")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_version:delete")
 //    @DeleteMapping(value = "/delete")
 //    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
 //        appSceneCostStandardVersionService.removeById(id);
@@ -105,7 +105,7 @@ public class AppSceneCostStandardVersionController extends JeecgController<AppSc
 //     */
 //    @AutoLog(value = "app_scene_cost_standard_version-批量删除")
 //    @ApiOperation(value = "app_scene_cost_standard_version-批量删除", notes = "app_scene_cost_standard_version-批量删除")
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_version:deleteBatch")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_version:deleteBatch")
 //    @DeleteMapping(value = "/deleteBatch")
 //    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
 //        this.appSceneCostStandardVersionService.removeByIds(Arrays.asList(ids.split(",")));
@@ -135,7 +135,7 @@ public class AppSceneCostStandardVersionController extends JeecgController<AppSc
 //     * @param request
 //     * @param appSceneCostStandardVersion
 //     */
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_version:exportXls")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_version:exportXls")
 //    @RequestMapping(value = "/exportXls")
 //    public ModelAndView exportXls(HttpServletRequest request, AppSceneCostStandardVersion appSceneCostStandardVersion) {
 //        return super.exportXls(request, appSceneCostStandardVersion, AppSceneCostStandardVersion.class, "app_scene_cost_standard_version");
@@ -148,7 +148,7 @@ public class AppSceneCostStandardVersionController extends JeecgController<AppSc
 //     * @param response
 //     * @return
 //     */
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_version:importExcel")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_version:importExcel")
 //    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
 //    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
 //        return super.importExcel(request, response, AppSceneCostStandardVersion.class);

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/AppSceneCostCountServiceImpl.java

@@ -2,6 +2,7 @@ package com.zzsmart.qomo.kn.cost.manage.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zzsmart.qomo.dao.entity.FlowDefinition;
 import com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostCount;
 import com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostPartMissingInfo;
 import com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostStandardVersion;
@@ -11,6 +12,7 @@ import com.zzsmart.qomo.kn.cost.manage.mapper.AppSceneCostPartMissingInfoMapper;
 import com.zzsmart.qomo.kn.cost.manage.service.IAppSceneCostCountService;
 import com.zzsmart.qomo.kn.cost.manage.service.IAppSceneCostStandardVersionService;
 import com.zzsmart.qomo.kn.cost.manage.vo.MissingComponentVO;
+import com.zzsmart.qomo.service.IDataFlowDefinitionService;
 import com.zzsmart.qomo.service.IDataFlowInstanceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/BomTreeServiceImpl.java

@@ -12,10 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
 import java.util.stream.Collectors;
 
 @Service
@@ -53,9 +50,12 @@ public class BomTreeServiceImpl implements BomTreeService {
                 parentDataMap = parentNodeList.stream().collect(Collectors.toMap(AppSceneCostStandardDetail::getMaterialNumber, vo -> vo));
             } else {
                 //父类结果有多个（找出最上级节点）
-                Map<Integer, List<AppSceneCostStandardDetail>> levelGroupMap = parentNodeList.stream().collect(Collectors.groupingBy(AppSceneCostStandardDetail::getLevel));
+                Map<Integer, List<AppSceneCostStandardDetail>> levelGroupMap = new HashMap<>();
+                if (parentNodeList != null && parentNodeList.size() > 0) {
+                    levelGroupMap = parentNodeList.stream().filter(s->s.getLevel()!=null).collect(Collectors.groupingBy(AppSceneCostStandardDetail::getLevel));
                     TreeMap<Integer, List<AppSceneCostStandardDetail>> levelTreeMap = new TreeMap<>(levelGroupMap);
-                parentDataMap = levelTreeMap.firstEntry().getValue().stream().collect(Collectors.toMap(AppSceneCostStandardDetail::getMaterialNumber, vo -> vo));
+                    parentDataMap = levelTreeMap.firstEntry().getValue().stream().filter(s->s.getMaterialNumber()!=null).collect(Collectors.toMap(AppSceneCostStandardDetail::getMaterialNumber, vo -> vo));
+                }
             }
             //查询所有父节点下的子节点(即第二层叶子节点)
             List<AppSceneCostStandardDetail> costStandardDetails = new ArrayList<>();

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/util/BomTreeBuilder.java

@@ -16,7 +16,17 @@ public class BomTreeBuilder {
             return result;
         }
         //1.把BOM信息分成按照物料号分组
-        Map<String, AppSceneCostStandardDetail> materialMap = sourceData.stream().filter(s -> s.getMaterialNumber() != null).collect(Collectors.toMap(AppSceneCostStandardDetail::getMaterialNumber, vo -> vo));
+        Map<String, AppSceneCostStandardDetail> materialMap = sourceData.stream().filter(s->s.getMaterialNumber()!=null)
+                .collect(Collectors.toMap(
+                        // Key extractor
+                        AppSceneCostStandardDetail::getMaterialNumber,
+                        // Value mapper
+                        detail -> detail,
+                        // Merger function to handle duplicates
+                        (existing, replacement) -> existing
+                ));
+
+//        Map<String, AppSceneCostStandardDetail> materialMap = sourceData.stream().filter(s -> s.getMaterialNumber() != null).collect(Collectors.toMap(AppSceneCostStandardDetail::getMaterialNumber, vo -> vo));
         //查找最顶端的父类节点
         if (parentDataMap == null || (parentDataMap != null && parentDataMap.size() < 1)) {
             parentDataMap = sourceData.stream().filter(s -> s.getParentMaterialNumber() == null).collect(Collectors.toMap(AppSceneCostStandardDetail::getMaterialNumber, vo -> vo));