Commit 25dfb03fff51a28879d95813a8702b6dc32f0b9c
1 parent
44e1d66c3d
Exists in
master
and in
8 other branches
增加
Showing 1 changed file with 11 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
View file @
25dfb03
| ... | ... | @@ -842,6 +842,9 @@ |
| 842 | 842 | if (user != null) { |
| 843 | 843 | |
| 844 | 844 | Users users = usersService.getUsers(id); |
| 845 | + if(null!=users.getOtherAccount()&&"1".equals(user.getOtherAccount()+"")){ | |
| 846 | + return; | |
| 847 | + } | |
| 845 | 848 | //根据当前登录的用户判断是否 有管理员的权限 |
| 846 | 849 | List<String> list = userRoleMapsService.queryUserRoleName(loginState.getId()); |
| 847 | 850 | if(CollectionUtils.isEmpty(list) ||!list.contains(ADMIN)){ |
| 848 | 851 | |
| ... | ... | @@ -967,8 +970,15 @@ |
| 967 | 970 | writeJson(response, JsonUtil.obj2JsonString(map)); |
| 968 | 971 | return; |
| 969 | 972 | } |
| 973 | + Users users =null; | |
| 974 | + if(CollectionUtils.isNotEmpty(usersList)){ | |
| 975 | + users =usersList.get(0); | |
| 976 | + if(null!=users.getOtherAccount()&&"1".equals(users.getOtherAccount()+"")){ | |
| 977 | + return; | |
| 978 | + } | |
| 979 | + } | |
| 970 | 980 | |
| 971 | - Users users = new Users(); | |
| 981 | + users = new Users(); | |
| 972 | 982 | users.setId(id); |
| 973 | 983 | users.setEnable(flag); |
| 974 | 984 | users.setModified(new Date()); |