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

6 years ago · 3090df32cf
parent ea314f9364 b827152c41
commit 3090df32cf
1 changed files with 5 additions and 3 deletions
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java
@ -104,6 +104,7 @@ public class AuthController extends CoreBaseController {
            List<SysMenu> menus = user.getMenuList();
            if(menus != null){
                for (SysMenu menu : menus) {
+                    if(menu != null){
                        if(menu.getMenuType().equals(CommonEnumUtil.METHOD_LEVEL.PLUGIN.getValue())
                                && menu.getParentId().longValue() != -1){
                            list.add(menu);
@ -111,6 +112,7 @@ public class AuthController extends CoreBaseController {
                    }
                }
            }
+        }

        if(list != null && list.size() > 0){
            // 内存排序  Sort 降序 code 升序