From f7163108fef21286a2b447f1958ee3204d7854d0 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期六, 02 十二月 2023 11:39:44 +0800
Subject: [PATCH] feat: 部门物品报废 1、分发单选择增加校验 2、明细列表字段对接
---
consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java
index beb28d3..8ccb9f5 100644
--- a/consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java
@@ -1,9 +1,9 @@
package com.consum.base.service;
import com.consum.base.Constants;
+import com.consum.base.core.utils.IdUtil;
import com.consum.base.pojo.BaseCategoryParam;
import com.consum.base.pojo.ProjectTreeResult;
-import com.consum.base.util.IdUtil;
import com.consum.model.po.BaseCategory;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
@@ -177,7 +177,11 @@
//1绾у垎绫�
List<ProjectTreeResult> menus = all.stream().filter(entity -> entity.getLevels() == 1).map(entity -> {
ProjectTreeResult projectTreeResult = new ProjectTreeResult(entity);
- projectTreeResult.setChildren(getChildren(projectTreeResult, all));
+ if (getChildren(projectTreeResult, all).isEmpty()) {
+ projectTreeResult.setChildren(null);
+ } else {
+ projectTreeResult.setChildren(getChildren(projectTreeResult, all));
+ }
return projectTreeResult;
}).sorted(Comparator.comparingInt(menu -> (menu.getSort() == null ? 0 : menu.getSort()))).collect(Collectors.toList());
return menus;
@@ -192,7 +196,11 @@
ProjectTreeResult projectTreeResult = new ProjectTreeResult(entity);
//閫氳繃閫掑綊鎵惧埌瀛愬垎绫�
- projectTreeResult.setChildren(getChildren(projectTreeResult, all));
+ if (getChildren(projectTreeResult, all).isEmpty()) {
+ projectTreeResult.setChildren(null);
+ } else {
+ projectTreeResult.setChildren(getChildren(projectTreeResult, all));
+ }
return projectTreeResult;
}).sorted(Comparator.comparingInt(menu -> (menu.getSort() == null ? 0 : menu.getSort()))).collect(Collectors.toList());
return children;
--
Gitblit v1.9.1