Merge branch 'feature/社群' into 'developer'

小程序查询

See merge request !813

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatPlanOwnerLogServiceImpl.java

@@ -191,6 +191,10 @@ public class GroupChatPlanOwnerLogServiceImpl implements GroupChatPlanOwnerLogSe
         if (clerkType == 1) {
             storeId = clerk.getStoreId();
             clerkId = null;
+            qdto.setClerkId(null);
+            if (StringUtils.isNotBlank(qdto.getSearchClerkId())) {
+                qdto.setClerkId(qdto.getSearchClerkId());
+            }
         }
         qdto.setStoreId(storeId);
         PageHelper.startPage(basePageInfo);

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatPlanOwnerLogMapper.xml

@@ -167,6 +167,9 @@
   	  	<if test="null != sendStatus">
   	  		and a.send_status = #{sendStatus}
   	  	</if>
+  	  	<if test="null != searchParams">
+  	  		and b.name like #{searchParams}
+  	  	</if>
   	  	group by b.plan_id
   	  	
   	  	order by a.create_time desc , a.owner_log_id

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/haoban/GroupChatPlanController.java

@@ -57,7 +57,7 @@ public class GroupChatPlanController {
         qdto.setEnterpriseId(enterpriseId);
         qdto.setClerkId(clerkId);
         if (StringUtils.isNotBlank(searchParams)) {
-            qdto.setSearchParams(searchParams);
+            qdto.setSearchParams("%"+searchParams+"%");
         }
         ServiceResponse<Page<ChatOwnerTotalDTO>> pageResp = this.groupChatPlanApiService
                 .listOwnerLogPageForWxaTotal(qdto, basePageInfo);