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

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java

@@ -104,9 +104,11 @@ public class AuthController extends CoreBaseController {
             List<SysMenu> menus = user.getMenuList();
             if(menus != null){
                 for (SysMenu menu : menus) {
-                    if(menu.getMenuType().equals(CommonEnumUtil.METHOD_LEVEL.PLUGIN.getValue())
+                    if(menu != null){
-                        && menu.getParentId().longValue() != -1){
+                        if(menu.getMenuType().equals(CommonEnumUtil.METHOD_LEVEL.PLUGIN.getValue())
-                        list.add(menu);
+                                && menu.getParentId().longValue() != -1){
+                            list.add(menu);
+                        }
                     }
                 }
             }