Merge branch 'master' into pre

# Conflicts:
#	netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupsRelationNetflixServiceImpl.java
#	netflix-web/src/main/java/com/cyksj/web/controller/group/GroupRelationController.java

netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupsRelationNetflixServiceImpl.java

@@ -56,6 +56,7 @@ public class GroupsRelationNetflixServiceImpl implements GroupsRelationNetflixSe
 		params.putOpt("seat_time", expiryTime);
 		//设置座位
 		String url = Constant.ZHAOJU_MOVIES + "/netflix_set/netflix_seat";
+		log.info("设置账号:{} 奈飞用户:{}座位信息", account, seatName);
 		try {
 			HttpResponse<String> res =
 					J11HttpC.custom()

netflix-web/src/main/java/com/cyksj/web/controller/group/GroupRelationController.java

@@ -119,10 +119,10 @@ public class GroupRelationController {
 
     private final AccountBlockedReplaceRecordMapper accountBlockedReplaceRecordMapper;
 
-    private final UserGoodsNewbieGuideRecordMapper userGoodsNewbieGuideRecordMapper;
-
     private final OrderDonMapper orderDonMapper;
 
+    private final UserGoodsNewbieGuideRecordMapper userGoodsNewbieGuideRecordMapper;
+
     private final GroupsRelationNetflixService groupsRelationNetflixService;
 
     private final static Sequence SEQUENCE = new Sequence(0);
@@ -780,6 +780,19 @@ public class GroupRelationController {
         return GatewayResponse.SUCCESS.newBuilder().toResult(expiryRenewals);
     }
 
+    /**
+     * 车票详情
+     */
+    @GetMapping("/get/detail")
+    public Result<RenewalView> getTicketDetail(Long relationId) {
+        if (relationId == null) {
+            return GatewayResponse.SUCCESS.newBuilder().toResult();
+        }
+        long userId = StpUserUtil.getLoginIdAsLong();
+        RenewalView ticketDetail = groupRelationFrontService.getTicketDetail(userId, relationId);
+        return GatewayResponse.SUCCESS.newBuilder().toResult(ticketDetail);
+    }
+
     /**
      * 车票售后常见问题
      */
@@ -825,19 +838,6 @@ public class GroupRelationController {
         return GatewayResponse.SUCCESS.newBuilder().toResult(false);
     }
 
-    /**
-     * 车票详情
-     */
-    @GetMapping("/get/detail")
-    public Result<RenewalView> getTicketDetail(Long relationId) {
-        if (relationId == null) {
-            return GatewayResponse.SUCCESS.newBuilder().toResult();
-        }
-        long userId = StpUserUtil.getLoginIdAsLong();
-        RenewalView ticketDetail = groupRelationFrontService.getTicketDetail(userId, relationId);
-        return GatewayResponse.SUCCESS.newBuilder().toResult(ticketDetail);
-    }
-
     /**
      * 设置pin码
      */

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

@@ -1,8 +1,10 @@
 package com.cyksj.web.controller.manage.corp;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cyksj.common.exception.BusinessRuntimeException;
+import com.cyksj.common.util.Jsons;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.model.entity.QyMsgContent;
@@ -19,6 +21,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
@@ -49,11 +52,11 @@ public class CorpMsgAuditController {
     /**
      * 会话存档用户列表
      * @param textKey 关键词搜索
-     * @param tagId 标签筛选
+     * @param tagIds 标签筛选
      * @return
      */
     @GetMapping
-    public Result<SearchResult<CorpMsgAuditUserView>> get(String textKey, String tagId, Integer intention) {
+    public Result<SearchResult<CorpMsgAuditUserView>> get(String textKey, @RequestParam(value = "tagIds", required = false) List<String> tagIds, Integer intention) throws Exception {
         Set<String> userIds = new HashSet<>();
         if(StringUtils.isNotBlank(textKey)){
             List<QyMsgContent> text = corpQyMsgContentService.list(Wrappers.lambdaQuery(QyMsgContent.class).select(QyMsgContent::getFrom, QyMsgContent::getExternalUserid,QyMsgContent::getTolist).like(QyMsgContent::getText, textKey).eq(QyMsgContent::getRoomid,"").eq(QyMsgContent::getMsgtype, "text"));
@@ -63,8 +66,14 @@ public class CorpMsgAuditController {
         if (userIds.size() > 0) {
             builder.field(CorpMsgAuditUserView::getExternalUserid,userIds).op(InList.class);
         }
-        if(StringUtils.isNotBlank(tagId)){
-            builder.put("tag", String.format( "and cr.id = t.relation_id and t.tag_id = '%s'", tagId));
+        if(CollUtil.isNotEmpty(tagIds)){
+            StringBuilder tagStr = new StringBuilder();
+            if (tagIds.size() == 1) {
+                tagStr.append("=").append("'").append(tagIds.get(0)).append("'");
+            } else {
+                tagStr.append("in").append(Jsons.toJson(tagIds).replaceAll("\\[", "(").replaceAll("]", ")"));
+            }
+            builder.put("tag", String.format( "and cr.id = t.relation_id and t.tag_id %s", tagStr));
             builder.put("tagTable", ",corp_user_tag t");
         }
         if (intention != null) {