From a303b748b5c225518d6ff276e0bb88de2f08385d Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Wed, 21 Aug 2024 10:11:07 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A0=91=E5=AD=97=E6=AE=B5id?= =?UTF-8?q?=E4=B8=BAnull=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/organization/entity/company/bo/CompBO.java | 4 ++-- .../organization/entity/department/bo/DepartmentBO.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/engine/organization/entity/company/bo/CompBO.java b/src/com/engine/organization/entity/company/bo/CompBO.java index 99e84519..240fa93a 100644 --- a/src/com/engine/organization/entity/company/bo/CompBO.java +++ b/src/com/engine/organization/entity/company/bo/CompBO.java @@ -33,7 +33,7 @@ public class CompBO { tree.setIsParent(false); tree.setIsVirtual("0"); tree.setName(item.getSubCompanyName()); - tree.setPid(item.getSupSubComId().toString()); + tree.setPid(item.getSupSubComId() == null ? "0" :item.getSupSubComId().toString()); tree.setSelected(false); tree.setType("1"); tree.setOrderNum(null == item.getShowOrder() ? 0 : item.getShowOrder()); @@ -101,7 +101,7 @@ public class CompBO { .subCompanyCode(e.getSubCompanyCode()) .subCompanyDesc(e.getSubCompanyDesc()) .subCompanyName(e.getSubCompanyName()) - .supSubComId(e.getSupSubComId()) + .supSubComId(e.getSupSubComId() == null ? 0 : e.getSupSubComId()) .supSubComName(null == poMaps.get(e.getSupSubComId()) ? "" : poMaps.get(e.getSupSubComId()).getSubCompanyName()) .showOrder(e.getShowOrder()) .canceled(null == e.getCanceled() ? 0 : e.getCanceled()) diff --git a/src/com/engine/organization/entity/department/bo/DepartmentBO.java b/src/com/engine/organization/entity/department/bo/DepartmentBO.java index 7dae62d8..881632a5 100644 --- a/src/com/engine/organization/entity/department/bo/DepartmentBO.java +++ b/src/com/engine/organization/entity/department/bo/DepartmentBO.java @@ -167,7 +167,7 @@ public class DepartmentBO { tree.setPid(null == item.getSupDepId() ? "0" : item.getSupDepId().toString()); tree.setSelected(false); tree.setType("2"); - tree.setParentComp(item.getSubCompanyId1().toString()); + tree.setParentComp(null == item.getSupDepId() ? "0" : item.getSubCompanyId1().toString()); tree.setOrderNum(null == item.getShowOrder() ? 0 : item.getShowOrder().intValue()); return tree; }).collect(Collectors.toList());