企业增添返回字段

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/EnterpriseController.java

@@ -143,8 +143,6 @@ public class EnterpriseController {
                 enterprise.setFiles(list);
             }
 
-
-
             // 获取标签
             List<TagLibraryDO> tagLibraryDOS = tagLibraryService.listByEnterpriseId(enterprise.getId());
             if (tagLibraryDOS != null) {
@@ -158,7 +156,6 @@ public class EnterpriseController {
                 enterprise.setTagList(Collections.emptyList());
             }
 
-
             //通过userID获取专管人
             if (enterprise.getUserId() != null) {
                 final AdminUserDO user = adminUserService.getUser(Long.valueOf(enterprise.getUserId()));
@@ -210,6 +207,20 @@ public class EnterpriseController {
             if (user != null) {
                 item.setInviterName(user.getNickname());
             }
+
+            final List<TagLibraryDO> tagLibraryDOS = tagLibraryService.listByEnterpriseId(item.getId());
+            if (tagLibraryDOS != null) {
+                List<LabelValueVO> labelValueVOList = new ArrayList<>();
+                tagLibraryDOS.forEach(tag->{
+                    LabelValueVO labelValueVO = new LabelValueVO();
+                    labelValueVO.setLabel(tag.getTagName());
+                    labelValueVO.setValue(tag.getParentId());
+                    labelValueVOList.add(labelValueVO);
+                });
+
+                item.setTagListName(labelValueVOList);
+            }
+
         });
         return success(BeanUtils.toBean(pageResult, EnterpriseRespVO.class));
     }
@@ -243,10 +254,29 @@ public class EnterpriseController {
             //企业图片
             final List<InfraFileInfoDTO> fileList = fileInfoService.getFileList(EnterpriseServiceImpl.DEFAULT_DICT_TYPE, EnterpriseServiceImpl.DEFAULT_DICT_DATA_QY, item.getId().toString());
             item.setFiles(fileList);
+
+            //邀请人姓名
+            final AdminUserDO user = adminUserService.getUser(Long.valueOf(item.getUserId()));
+            if (user != null) {
+                item.setInviterName(user.getRealName());
+            }
+
             // 企业标签
             final List<TagLibraryDO> tagLibraryDOS1 = tagLibraryService.listByEnterpriseId(item.getId());
             if (tagLibraryDOS1 != null && tagLibraryDOS1.size() > 0) {
                 item.setTagList(tagLibraryDOS1.stream().map(item1->item1.getTagName()).collect(Collectors.toList()));
+
+                List<LabelValueVO> labelValueVOList = new ArrayList<>();
+                tagLibraryDOS1.forEach(tag->{
+                    LabelValueVO labelValueVO = new LabelValueVO();
+                    labelValueVO.setLabel(tag.getTagName());
+                    labelValueVO.setValue(tag.getParentId());
+                    labelValueVOList.add(labelValueVO);
+
+                });
+
+                item.setTagListName(labelValueVOList);
+
             }
 
         });

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/vo/EnterpriseRespVO.java

@@ -118,7 +118,6 @@ public class EnterpriseRespVO {
     @ExcelProperty("邀请人")
     private String inviterName;
 
-
-
+    private List<LabelValueVO> tagListName;
 
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/vo/LabelValueVO.java

@@ -0,0 +1,11 @@
+package cn.iocoder.yudao.module.system.controller.admin.enterprise.vo;
+
+import lombok.Data;
+
+@Data
+public class LabelValueVO {
+	//值
+	private Integer value;
+	//名称
+	private String label;
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/enterprise/EnterpriseDO.java

@@ -1,15 +1,12 @@
 package cn.iocoder.yudao.module.system.dal.dataobject.enterprise;
 
 import cn.iocoder.yudao.module.infra.api.file.dto.InfraFileInfoDTO;
+import cn.iocoder.yudao.module.system.controller.admin.enterprise.vo.LabelValueVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.qualification.EnterpriseQualificationDO;
-import cn.iocoder.yudao.module.system.dal.dataobject.taglibrary.TagLibraryDO;
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
 import java.time.LocalDate;
 import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 
@@ -107,4 +104,6 @@ public class EnterpriseDO extends BaseDO {
     @TableField(exist = false)
     private String inviterName;
 
+    @TableField(exist = false)
+    private List<LabelValueVO> tagListName;
 }