Merge branch 'msg' into dev

# Conflicts:
#	netflix-dao/src/main/java/com/cyksj/model/manage/views/CorpQyMsgAuditChatView.java

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

@@ -15,8 +15,7 @@ import lombok.Data;
         " corp_follow cf ",
         where = "q.external_userid = cu.external_userid " +
                 " AND cu.corp_user_id = c.id  " +
-                " AND q.follow_id = cf.userid " +
-                " AND q.follow_id in (:followId:) ",
+                " AND q.follow_id = cf.userid ",
         groupBy = "c.name,c.avatar,cu.external_userid ,cf.name,cf.avatar "
 )
 @Data

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

@@ -29,6 +29,7 @@ import com.cyksj.service.corp.CorpService;
 import com.cyksj.service.corp.CorpUserService;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.SearchResult;
+import com.ejlchina.searcher.param.Operator;
 import com.ejlchina.searcher.util.MapUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -284,9 +285,9 @@ public class WxCorpController {
 			throw BusinessRuntimeException.getInstance("缺少必填参数.");
 		}
 		List<CorpQyMsgAuditChatView> search = beanSearcher.searchAll(CorpQyMsgAuditChatView.class, MapUtils.flatBuilder(request.getParameterMap())
-				.put("followId", followIds.stream()
+				.field("followId", followIds.stream()
 						.map(String::valueOf)
-						.collect(Collectors.joining(",")))
+						.collect(Collectors.toList())).op(Operator.InList)
 				.build());
 		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
 	}