From 7d9c551129ea9cd62c3102996f36bbd898f65574 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= <yunhao.wang@estsh.com>
Date: Thu, 5 Dec 2019 10:56:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=AD=E8=A8=80=E8=B5=84=E6=BA=90=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceimpl/base/SystemInitService.java           | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java
index cb8f847..c121003 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java
@@ -9,8 +9,11 @@ import cn.estsh.i3plus.platform.common.util.CommonConstWords;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
-import cn.estsh.i3plus.pojo.base.util.StringUtil;
-import cn.estsh.i3plus.pojo.platform.bean.*;
+import cn.estsh.i3plus.pojo.platform.bean.SysConfig;
+import cn.estsh.i3plus.pojo.platform.bean.SysDictionary;
+import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage;
+import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource;
+import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
 import cn.estsh.i3plus.pojo.platform.repository.SysConfigRepository;
 import cn.estsh.i3plus.pojo.platform.repository.SysDictionaryRepository;
 import cn.estsh.i3plus.pojo.platform.repository.SysLocaleLanguageRepository;
@@ -22,9 +25,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -69,7 +74,6 @@ public class SystemInitService implements ISystemInitService {
         putAndLoadSysConfig();
         putAndLoadSysDictionary();
         putAndLoadSysLocaleLanguage();
-        putAndLoadSysMenu();
     }
 
     @Override
@@ -166,6 +170,9 @@ public class SystemInitService implements ISystemInitService {
             }
 
         }
+
+        //加载语言数据
+        putAndLoadSysMenu();
     }
 
     @ApiOperation(value = "加载语言数据",notes = "加载语言数据")
@@ -220,8 +227,6 @@ public class SystemInitService implements ISystemInitService {
         }
     }
 
-
-
     /**
      * 缓存存放数据统一管理
      * @param key