更新！11

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/user/UserAccountServiceImpl.java

@@ -664,6 +664,7 @@ public class UserAccountServiceImpl extends SuperService implements UserAccountS
         if (StringUtils.isEmpty(oid)) {
             oid = getCurrentOid();
         }
+        // 查询用户基本信息
         Page<UserAccount> page = userCountDao.page(pageable, param);
 
         List<UserCountAboutRoleModel> models = new ArrayList<>();
@@ -725,7 +726,8 @@ public class UserAccountServiceImpl extends SuperService implements UserAccountS
         if (ObjectUtils.isNotEmpty(entity)) {
             model = new UserCountAboutRoleModel();
             BeanUtils.copyProperties(entity, model);
-            // 角色
+
+            // 角色（指定机构上角色信息）
             if (StringUtils.isNotEmpty(oid)) {
                 OrganizationUser organizationUser = organizationUserDao.findTopByUserIdAndOid(entity.getUserId(), oid);
                 if (ObjectUtils.isNotEmpty(organizationUser)) {