添加gic品牌名称字段

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/StaffDTO.java

@@ -127,6 +127,18 @@ public class StaffDTO implements Serializable {
      * 企微激活码
      */
     private String activeCode;
+    /**
+     * gic品牌名称
+     */
+    private List<String> enterpriseNameList;
+
+    public List<String> getEnterpriseNameList() {
+        return enterpriseNameList;
+    }
+
+    public void setEnterpriseNameList(List<String> enterpriseNameList) {
+        this.enterpriseNameList = enterpriseNameList;
+    }
 
     public String getActiveCode() {
         return activeCode;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java

@@ -107,6 +107,8 @@ public class StaffApiServiceImpl implements StaffApiService {
     private QywxOrderApiService qywxOrderApiService;
     @Autowired
     private GroupChatService groupChatService;
+    @Autowired
+    private WxEnterpriseRelatedService wxEnterpriseRelatedService;
 
     @Override
     public StaffDTO selectById(String staffId) {
@@ -154,8 +156,17 @@ public class StaffApiServiceImpl implements StaffApiService {
         }
         Set<String> staffIdList = staffDTOList.stream().map(dto -> dto.getStaffId()).collect(Collectors.toSet());
         List<String> relationIdList = this.staffClerkRelationService.listRelationsStaffId(staffIdList);
+        //已关联的成员需要查询关联的品牌名称
+        List<TabHaobanWxEnterpriseRelated> list = wxEnterpriseRelatedService.getByWxEnterpriseId(wxEnterpriseId);
+        List<String> enterpriseNameSet = list.stream().map(dto -> dto.getEnterpriseName()).collect(Collectors.toList());
         staffDTOList.forEach(one -> {
-            one.setRelationFlag(relationIdList.contains(one.getStaffId()) ? 1 : 0);
+            if(relationIdList.contains(one.getStaffId())){
+                one.setRelationFlag(1);
+                one.setEnterpriseNameList(enterpriseNameSet);
+            }else {
+                one.setRelationFlag(0);
+            }
+
         });
         return page;
     }