From 296b553d8442d4f9d0feb4cc912104479d526125 Mon Sep 17 00:00:00 2001
From: "wei.peng" <123456>
Date: Mon, 25 Nov 2019 10:38:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90Bug=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceimpl/busi/SysLocaleResourceService.java      | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java
index f115375..e0e95c3 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java
@@ -205,15 +205,18 @@ public class SysLocaleResourceService implements ISysLocaleResourceService {
 
             if(menuResourceMap != null && menuResourceMap.size() > 0 ){
                 for (SysMenu menu : menuList) {
-                    if(StringUtils.isNotBlank(menu.getName())){
-                        String menuName = (String)menuResourceMap.get(menu.getName());
-                        menu.setName(StringUtils.isNotBlank(menuName) ? menuName : menu.getName());
+                    if(menu != null){
+                        if(StringUtils.isNotBlank(menu.getName())){
+                            String menuName = (String)menuResourceMap.get(menu.getName());
+                            menu.setName(StringUtils.isNotBlank(menuName) ? menuName : menu.getName());
+                        }
+
+                        if(StringUtils.isNotBlank(menu.getParentNameRdd())){
+                            String parentNameRdd = (String)menuResourceMap.get(menu.getParentNameRdd());
+                            menu.setParentNameRdd(StringUtils.isNotBlank(parentNameRdd) ? parentNameRdd : menu.getParentNameRdd());
+                        }
                     }
 
-                    if(StringUtils.isNotBlank(menu.getParentNameRdd())){
-                        String parentNameRdd = (String)menuResourceMap.get(menu.getParentNameRdd());
-                        menu.setParentNameRdd(StringUtils.isNotBlank(parentNameRdd) ? parentNameRdd : menu.getParentNameRdd());
-                    }
                 }
             }
         }