Merge branch 'msg' into dev

netflix-dao/src/main/java/com/cyksj/model/manage/views/CorpMsgAuditUserView.java

@@ -54,6 +54,12 @@ public class CorpMsgAuditUserView {
     @DbField("f.name")
     private String followName;
 
+    /**
+     * 成员userid
+     */
+    @DbField("f.userid")
+    private String followId;
+
     /**
      * 会话存档同意情况 同意:"Agree"，不同意:"Disagree"
      */

netflix-web/src/main/java/com/cyksj/web/controller/manage/corp/CorpMsgAuditController.java

@@ -10,6 +10,7 @@ import com.cyksj.service.corp.CorpQyMsgContentService;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.SearchResult;
 import com.ejlchina.searcher.operator.InList;
+import com.ejlchina.searcher.param.Operator;
 import com.ejlchina.searcher.util.MapBuilder;
 import com.ejlchina.searcher.util.MapUtils;
 import lombok.RequiredArgsConstructor;
@@ -50,7 +51,7 @@ public class CorpMsgAuditController {
      * @return
      */
     @GetMapping
-    public Result<SearchResult<CorpMsgAuditUserView>> get(String textKey, String tagId){
+    public Result<SearchResult<CorpMsgAuditUserView>> get(String textKey, String tagId,String followId) {
         Set<String> userIds = new HashSet<>();
         if(StringUtils.isNotBlank(textKey)){
             List<QyMsgContent> text = corpQyMsgContentService.list(Wrappers.lambdaQuery(QyMsgContent.class).select(QyMsgContent::getFrom, QyMsgContent::getTolist).like(QyMsgContent::getText, textKey).eq(QyMsgContent::getRoomid,"").eq(QyMsgContent::getMsgtype, "text"));
@@ -63,6 +64,9 @@ public class CorpMsgAuditController {
         if(StringUtils.isNotBlank(tagId)){
             builder.put("tag", String.format( "and cr.id = t.relation_id and t.tag_id = %s", tagId));
         }
+        if (StringUtils.isNotBlank(followId)) {
+            builder.field(CorpMsgAuditUserView::getFollowId, followId).op(Operator.Equal);
+        }
         SearchResult<CorpMsgAuditUserView> search = beanSearcher.search(CorpMsgAuditUserView.class, builder.build());
         return GatewayResponse.SUCCESS.newBuilder().toResult(search);