From 52a82227db854b8d6c9512934f0b7c5323239070 Mon Sep 17 00:00:00 2001 From: "rui.zhang" Date: Mon, 2 May 2016 15:55:01 +0800 Subject: [PATCH] platform permission add return pageinfo --- .../platform/operate/web/controller/UsersController.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java index 97374da..b8076a1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java @@ -730,12 +730,15 @@ public class UsersController extends BaseController { String[] roleArrayIds = roleIds.split(","); //判断角色是否有更新 Boolean flag = false; - for (String s : roleArrayIds) { - for(Roles role : users.getRoles()) { - if(s.equals(role.getId().toString())) continue; - flag = true; + if(null == users.getRoles()) flag = true; + if(!flag) { + for (String s : roleArrayIds) { + for(Roles role : users.getRoles()) { + if(s.equals(role.getId().toString())) continue; + flag = true; + } + if(flag) break; } - if(flag) break; } if(flag) { -- 1.8.3.1