后台账号列表返回单位信息

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

@@ -55,4 +55,6 @@ public class BackUserAccountVO implements Serializable {
     private String tagName;
     @ApiModelProperty(value = "地址")
     private String address;
+    @ApiModelProperty(value = "单位信息")
+    private CompanyInfoVO companyInfoVO;
 }

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

@@ -104,8 +104,14 @@ public class BackUserAccountServiceImpl implements BackUserAccountService {
         List<BackUserAccountVO> collect = users.stream().map(BackUserAccountDO::buildBackUserAccountVO).collect(Collectors.toList());
         List<CompanyInfoDO> companyInfoDOList = companyService.listCompanyInfoByUID(backUserIds);
         if (!companyInfoDOList.isEmpty()){
-            Map<Integer, String> userCompanyNameMap = companyInfoDOList.stream().collect(Collectors.toMap(CompanyInfoDO::getBackUserAccountId, CompanyInfoDO::getCompanyName, (k1, k2) -> k2));
-            collect.forEach(d -> d.setCompanyName(userCompanyNameMap.get(d.getId())));
+            Map<Integer, CompanyInfoDO> userCompanyNameMap = companyInfoDOList.stream().collect(Collectors.toMap(CompanyInfoDO::getBackUserAccountId, k -> k, (v1, v2) -> v2));
+            collect.forEach(d -> {
+                CompanyInfoDO companyInfoDO = userCompanyNameMap.get(d.getId());
+                if (companyInfoDO != null){
+                    d.setCompanyName(companyInfoDO.getCompanyName());
+                    d.setCompanyInfoVO(companyInfoDO.buildCompanyInfoVO());
+                }
+            });
         }
         return ResultBody.success(PageResult.buildPage(pageNo, param.getPageSize(), count, collect));
     }