Commit 3f6ad1ec by 徐高华

通知

parent 2ebe565e
...@@ -202,6 +202,14 @@ public class GroupChatPlanOwnerLogServiceImpl implements GroupChatPlanOwnerLogSe ...@@ -202,6 +202,14 @@ public class GroupChatPlanOwnerLogServiceImpl implements GroupChatPlanOwnerLogSe
qdto.setClerkId(qdto.getSearchClerkId()); qdto.setClerkId(qdto.getSearchClerkId());
} }
} }
if(clerkType > 1) {
storeId = qdto.getStoreId() ;
clerkId = null;
qdto.setClerkId(null);
if (StringUtils.isNotBlank(qdto.getSearchClerkId())) {
qdto.setClerkId(qdto.getSearchClerkId());
}
}
qdto.setStoreId(storeId); qdto.setStoreId(storeId);
PageHelper.startPage(basePageInfo); PageHelper.startPage(basePageInfo);
List<ChatOwnerTotalDTO> list = this.groupChatPlanOwnerLogMapper.listOwnerLogPageForWxaTotal(qdto); List<ChatOwnerTotalDTO> list = this.groupChatPlanOwnerLogMapper.listOwnerLogPageForWxaTotal(qdto);
......
...@@ -59,7 +59,7 @@ public class GroupChatPlanController { ...@@ -59,7 +59,7 @@ public class GroupChatPlanController {
*/ */
@RequestMapping("total-list") @RequestMapping("total-list")
public RestResponse<Page<ChatOwnerTotalDTO>> totalList(String clerkId, String wxEnterpriseId, String enterpriseId, public RestResponse<Page<ChatOwnerTotalDTO>> totalList(String clerkId, String wxEnterpriseId, String enterpriseId,
String searchParams, BasePageInfo basePageInfo , @RequestParam(defaultValue = "1") int clerkTaskStatus) { String searchParams, BasePageInfo basePageInfo , @RequestParam(defaultValue = "1") int clerkTaskStatus , String storeId) {
if (StringUtils.isEmpty(clerkId)) { if (StringUtils.isEmpty(clerkId)) {
return RestResponse.failure("1", "clerkId为空"); return RestResponse.failure("1", "clerkId为空");
} }
...@@ -67,6 +67,7 @@ public class GroupChatPlanController { ...@@ -67,6 +67,7 @@ public class GroupChatPlanController {
qdto.setWxEnterpriseId(wxEnterpriseId); qdto.setWxEnterpriseId(wxEnterpriseId);
qdto.setEnterpriseId(enterpriseId); qdto.setEnterpriseId(enterpriseId);
qdto.setClerkId(clerkId); qdto.setClerkId(clerkId);
qdto.setStoreId(storeId);
if (StringUtils.isNotBlank(searchParams)) { if (StringUtils.isNotBlank(searchParams)) {
qdto.setSearchParams("%" + searchParams + "%"); qdto.setSearchParams("%" + searchParams + "%");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment