north-glass-erp/src/main/java/com/example/erp/controller/dto/UserDTO.java
@@ -11,7 +11,7 @@ private String pass; private String token; private String userName; private String address; private Object address; private String phone; private List<String> permissions; } north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java
@@ -149,10 +149,8 @@ if(list!=null && list.size()==1){ userDTO.setAddress(list.get(0)); }else{ userDTO.setAddress(user.getAddress()); userDTO.setAddress(list); } userDTO.setToken(StpUtil.getTokenValue()); Boolean userIsAdmin= userRoleMapper.getUserIsAdmin(user.getId()); userDTO.setPermissions(permissionRoleMapper.getUserEditPermission(user.getId(),userIsAdmin));
