From 8ee9b79c7124bd8a1d25b7a49b77df5b1956d21b Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 10 Jul 2021 09:10:26 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/common/service/impl/SysFunctionServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/common/service/impl/SysFunctionServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/common/service/impl/SysFunctionServiceImpl.java
index 9137ed9..19194e9 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/service/impl/SysFunctionServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/service/impl/SysFunctionServiceImpl.java
@@ -4,6 +4,7 @@
import com.matrix.core.constance.SystemErrorCode;
import com.matrix.core.exception.GlobleException;
import com.matrix.core.pojo.PaginationVO;
+import com.matrix.core.tools.LogUtil;
import com.matrix.core.tools.ModelUtils;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.common.authority.DefaultAuthorityManager;
@@ -365,11 +366,14 @@
} else {
// 非一级节点找到父节点后存入
SysFunction parentFn = allFnMap.get(String.valueOf(function.getFnParentId()));
- List<SysFunction> childs = parentFn.getChilds();
- if (childs == null) {
- parentFn.setChilds(new ArrayList<SysFunction>());
+ if(parentFn!=null){
+ List<SysFunction> childs = parentFn.getChilds();
+ if (childs == null) {
+ parentFn.setChilds(new ArrayList<SysFunction>());
+ }
+ parentFn.getChilds().add(function);
}
- parentFn.getChilds().add(function);
+
}
}
--
Gitblit v1.9.1