修改代码

notes-pas/src/main/java/com/zjty/tynotes/pas/controller/UserController.java

@@ -93,7 +93,7 @@ public class UserController {
 
     @ApiOperation(value = "根据id查询用户", response = User.class)
     @GetMapping("/findUser/{id}")
-    public ResponseEntity findUser(@RequestBody @Valid String id) {
+    public ResponseEntity findUser(@PathVariable("id") String id) {
         return ok(iUserService.findUserById(id));
     }
 

notes-pas/src/main/java/com/zjty/tynotes/pas/service/impl/UserServiceImpl.java

@@ -62,6 +62,11 @@ public class UserServiceImpl implements IUserService {
 
     @Override
     public User updateUser(User user) {
+        Optional<User> optional = pasUserDao.findById(user.getId());
+        if(optional.isPresent()){
+            User user1 = optional.get();
+            user.setPassword(user1.getPassword());
+        }
         List<UserRole> roles = new ArrayList<>();
         userRoleDao.deleteAllByUserId(user.getId());
         List<UserRole> userRoleList = new ArrayList<>();
@@ -154,7 +159,16 @@ public class UserServiceImpl implements IUserService {
     @Override
     public List<User> findAll() {
         List<User> users = pasUserDao.findAll();
-        return users.stream().filter(user -> !"root".equals(user.getUsername())).collect(Collectors.toList());
+        for (User user : users) {
+            List<UserRole> userRoles = userRoleDao.findAllByUserId(user.getId());
+            List<String> roleIds = new ArrayList<>();
+            for (UserRole userRole : userRoles) {
+                roleIds.add(userRole.getRoleId());
+            }
+            List<Role> roles = roleDao.findAllByIdIn(roleIds);
+            user.setRoles(roles);
+        }
+        return users;
     }
 
     @Override