diff --git a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeChatSideController.java b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeChatSideController.java index 00c5ac133551a1cf951cbfdb469e91c184e31e56..0c37fff9f0fc7ba8e9238aeb304b249b48e73b1d 100644 --- a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeChatSideController.java +++ b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeChatSideController.java @@ -30,9 +30,9 @@ public class WeChatSideController extends BaseController { */ @PreAuthorize("@ss.hasPermi('chat:side:list')") @GetMapping("/list") - public TableDataInfo list() { + public TableDataInfo list(@RequestParam(value = "h5") String h5) { startPage(); - List weChatSides = weChatSideService.chatSides(); + List weChatSides = weChatSideService.chatSides(h5); return getDataTable(weChatSides); } diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeChatSideMapper.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeChatSideMapper.java index 3439594aa89a93dd6cc512e82fda66e9b1eb8c33..215f48f1a7c59109393bc47a3450f85c4532f8a3 100644 --- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeChatSideMapper.java +++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeChatSideMapper.java @@ -15,10 +15,10 @@ public interface WeChatSideMapper extends BaseMapper { /** * 查询侧边栏列表 - * + * @param h5 0 pc 1 h5 * @return {@link WeChatSide}s */ - public List selectWeChatSides(); + public List selectWeChatSides(@Param("h5") String h5); /** diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeChatSideService.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeChatSideService.java index 03062de2ad3fd8e671836ae8b6b306977f0f5de0..5bbf2ab624153f796bf20496c1cbd963dadd5466 100644 --- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeChatSideService.java +++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeChatSideService.java @@ -16,7 +16,7 @@ public interface IWeChatSideService extends IService { * * @return {@link WeChatSide}s */ - public List chatSides(); + public List chatSides(String h5); /** * 更新侧边栏信息 diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeChatSideServiceImpl.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeChatSideServiceImpl.java index 929b29f96a7bb6d701f1fb10cacbf83ccba84ae3..0bdc801c3ad36ae76deae22776159e571d4aefac 100644 --- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeChatSideServiceImpl.java +++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeChatSideServiceImpl.java @@ -21,8 +21,8 @@ public class WeChatSideServiceImpl extends ServiceImpl chatSides() { - return weChatSideMapper.selectWeChatSides(); + public List chatSides(String h5) { + return weChatSideMapper.selectWeChatSides(h5); } @Override diff --git a/linkwe-wecom/src/main/resources/mapper/wecom/WeChatSideMapper.xml b/linkwe-wecom/src/main/resources/mapper/wecom/WeChatSideMapper.xml index ce8f9e164c8f08119daf452224a97111aeddc732..fda2f915ebe86354c8832eddb0f6a828a89ab60d 100644 --- a/linkwe-wecom/src/main/resources/mapper/wecom/WeChatSideMapper.xml +++ b/linkwe-wecom/src/main/resources/mapper/wecom/WeChatSideMapper.xml @@ -31,7 +31,9 @@ FROM we_chat_side - `using`=0 + + `using`=0 +