代码修改

notes-weekly/src/main/java/com/zjty/tynotes/weekly/subject/entity/vo/UserVo.java

@@ -107,7 +107,8 @@ public class UserVo {
         this.password = user.getPassword();
         this.departmentIds = user.getDepartmentIds();
         this.roles = new ArrayList<>();
-        this.status = null;
-        this.workCount = null;
+        this.status = user.getStatus();
+        this.workCount = user.getWorkNum();
+        this.roles = user.getRoles();
     }
 }

notes-weekly/src/main/java/com/zjty/tynotes/weekly/subject/service/impl/UserManageServiceImpl.java

@@ -114,6 +114,13 @@ public class UserManageServiceImpl implements UserManageService {
         if(totalPage>currentPage){
             users1 = userList.subList(start, end);
             for (User user : users1) {
+                List<String> roleIds = new ArrayList<>();
+                List<UserRole> userRoles = userRoleDao.findAllByUserId(user.getId());
+                for (UserRole userRole : userRoles) {
+                    roleIds.add(userRole.getRoleId());
+                }
+                List<Role> roles = roleDao.findAllByIdIn(roleIds);
+                user.setRoles(roles);
                 userVos.add(new UserVo(user));
             }
             pageResponse.setRows(userVos);
@@ -122,6 +129,13 @@ public class UserManageServiceImpl implements UserManageService {
         }else{
             users1 = userList.subList(start, userList.size());
             for (User user : users1) {
+                List<String> roleIds = new ArrayList<>();
+                List<UserRole> userRoles = userRoleDao.findAllByUserId(user.getId());
+                for (UserRole userRole : userRoles) {
+                    roleIds.add(userRole.getRoleId());
+                }
+                List<Role> roles = roleDao.findAllByIdIn(roleIds);
+                user.setRoles(roles);
                 userVos.add(new UserVo(user));
             }
             pageResponse.setRows(userVos);