chenbiao před 2 roky
rodič
revize
3b1a4fd943

+ 4 - 0
netflix-dao/src/main/java/com/cyksj/model/entity/CorpMsgFollowAssociation.java

@@ -1,5 +1,6 @@
 package com.cyksj.model.entity;
 
+import com.ejlchina.searcher.bean.DbField;
 import com.ejlchina.searcher.bean.SearchBean;
 import lombok.Data;
 
@@ -11,9 +12,12 @@ import lombok.Data;
 @SearchBean(tables = " corp_follow cf,corp_msg_follow_association ca ", where = "cf.userid = ca.follow_id")
 public class CorpMsgFollowAssociation extends BaseEntity{
 
+    @DbField("cf.userid")
     private String followId;
 
+    @DbField("ca.association_follow_id")
     private String associationFollowId;
 
+    @DbField("cf.name")
     private String nickname;
 }

+ 7 - 2
netflix-web/src/main/java/com/cyksj/web/controller/manage/corp/CorpMsgFollowController.java

@@ -17,6 +17,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -52,8 +53,12 @@ public class CorpMsgFollowController {
         search.getDataList().forEach((data)->{
             List<CorpMsgFollowAssociation> corpMsgFollowAssociations = beanSearcher.searchAll(CorpMsgFollowAssociation.class, MapUtils.builder().field(CorpMsgFollowAssociation::getFollowId, data.getUserid()).build());
             List<String> followIds = corpMsgFollowAssociations.stream().map(CorpMsgFollowAssociation::getAssociationFollowId).collect(Collectors.toList());
-            List<CorpMsgFollowAssociationView> corpMsgFollowAssociationViews = beanSearcher.searchAll(CorpMsgFollowAssociationView.class, MapUtils.builder().field(CorpMsgFollowAssociationView::getUserid, followIds).op(Operator.InList).build());
-            data.setAssociationList(corpMsgFollowAssociationViews);
+            if(followIds.size() > 0 ){
+                List<CorpMsgFollowAssociationView> corpMsgFollowAssociationViews = beanSearcher.searchAll(CorpMsgFollowAssociationView.class, MapUtils.builder().field(CorpMsgFollowAssociationView::getUserid, followIds).op(Operator.InList).build());
+                data.setAssociationList(corpMsgFollowAssociationViews);
+            }else {
+                data.setAssociationList(new ArrayList<>());
+            }
         });
         return GatewayResponse.SUCCESS.newBuilder().toResult(search);
     }