Merge remote-tracking branch 'remotes/origin/dev' into test

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java

@@ -72,6 +72,7 @@ public class SystemInitService implements ISystemInitService {
     @Override
     @ApiOperation(value = "加载字典数据",notes = "加载字典数据")
     public void loadSysDictionary() {
+        try {
             List<SysDictionary> list = dictionaryRDao.findAll();
             if(list != null && list.size() > 0){
                 Map<String, List<SysDictionary>> parentCodeMap = list.stream().collect(Collectors.groupingBy(SysDictionary::getParentCodeRdd));
@@ -88,6 +89,9 @@ public class SystemInitService implements ISystemInitService {
                             parentIdMap.get(key),List.class);
                 }
             }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
     }
 
     @Override