返回对应客服的用户信息

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/CompanyMemberVO.java

@@ -25,4 +25,7 @@ public class CompanyMemberVO implements Serializable {
 
     @ApiModelProperty(value = "角色姓名")
     private String roleName;
+
+    @ApiModelProperty(value = "用户信息")
+    private UserAccountVO userAccountVO;
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/CompanyServiceImpl.java

@@ -19,6 +19,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -319,7 +320,20 @@ public class CompanyServiceImpl implements CompanyService {
     @Override
     public ResultBody listUserAndRoleByCompanyId(Integer companyInfoId) {
         List<CompanyMemberDO> companyMemberDOS = companyDao.selectUserAndRoleList(companyInfoId);
-        List<CompanyMemberVO> companyMemberVOS = companyMemberDOS.stream().map(CompanyMemberDO::builCompanyMemberVO).collect(Collectors.toList());
+        List<CompanyMemberVO> companyMemberVOS = new ArrayList<>();
+        // 遍历 companyMemberDOS 中的 userAccountId
+        for (CompanyMemberDO companyMemberDO : companyMemberDOS) {
+            Integer userAccountId = companyMemberDO.getUserAccountId();
+            UserAccountDO userAccount = userServiceDao.getUserAccountById(userAccountId);
+            UserAccountVO userAccountVO = userAccount.buildUserAccountVO();
+            CompanyMemberVO companyMemberVO = CompanyMemberVO.builder()
+                    .userAccountId(companyMemberDO.getUserAccountId())
+                    .roleId(companyMemberDO.getLeader())
+                    .roleName(companyMemberDO.getRoleName())
+                    .userAccountVO(userAccountVO)
+                    .build();
+            companyMemberVOS.add(companyMemberVO);
+        }
         return ResultBody.success(companyMemberVOS);
     }