diff --git a/src/main/java/com/cetc32/dh/controller/rest/AuthController.java b/src/main/java/com/cetc32/dh/controller/rest/AuthController.java index 0f0dd79189d4c28060c6765cf5e6c261b2c261a1..fbe20d4ecb0d70bf3064d8bbd10407535d634943 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/AuthController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/AuthController.java @@ -396,6 +396,7 @@ public class AuthController { @ApiImplicitParam(name = "userStatus", value = "用户状态(-1:待审核,0:已删除,1:正常)",dataType = "Integer",defaultValue = "1") }) @PostMapping(value = "/users") + //@LoginSkipped // public PageDataResult getUserList(@RequestBody UserInfo user_info){ public PageDataResult getUserList(@RequestBody Map userInfo){ BaseAdminUser user_info=CreateUser(userInfo); @@ -555,6 +556,8 @@ public class AuthController { } // 属性名不一致 user_info.setRoleId(userInfoMap.getOrDefault("role",null)); + //System.out.println(userInfoMap.get("permissions")); + user_info.setPermissions(userInfoMap.get("permissions")); // user_info.setDepartment(userInfoMap.getOrDefault("department",null)); // user_info.setSecurity(getMapValueInt(userInfoMap,"security")); // user_info.setPage(getMapValueInt(userInfoMap,"page")); diff --git a/src/main/java/com/cetc32/dh/entity/BaseAdminUser.java b/src/main/java/com/cetc32/dh/entity/BaseAdminUser.java index fb78e1896d2c5bc22bfc7d0b956c8a643c3c4c11..4e72c82bba753336e36d20c90fa5da8a4fb56b14 100644 --- a/src/main/java/com/cetc32/dh/entity/BaseAdminUser.java +++ b/src/main/java/com/cetc32/dh/entity/BaseAdminUser.java @@ -594,10 +594,38 @@ public class BaseAdminUser extends NumberS { public String getPermissions() { return permissions; } - public void setPermissions(String permissions) { this.permissions = permissions; } + public void setPermissions(Object permissions) { + this.permissions=null; + if(permissions instanceof String) + this.permissions = (String)permissions; + else if(permissions instanceof String[] && null != permissions && ((String[])permissions).length>0){ + this.permissions =","; + for(String s :((String[])permissions) ) + this.permissions += s+","; + }else if(permissions instanceof List && null != permissions && ((List)permissions).size()>0){ + this.permissions =","; + for(String s :((List)permissions)) + this.permissions += s+","; + } + } + /*public void setPermissions(String[] permissions) { + if(null != permissions && permissions.length>0){ + this.permissions =","; + for(String s :permissions) + this.permissions += s+","; + } + } + public void setPermissions(List permissions) { + + if(null != permissions && permissions.size()>0){ + this.permissions =","; + for(String s :permissions) + this.permissions += s+","; + } + }*/ /** * 实体类转换成字符串 diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 69811693b74215e5b088098d431068d90c763275..1cb2894ddbb570701cbf9178bd26140a4aaca30c 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -10,7 +10,7 @@
- +

统一认证登陆系统