From 5e3fb5903002cd574e9cc8fa47f574124381f4a2 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 20 Mar 2023 15:05:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E9=A2=84=E8=AD=A6=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/inv/InvRemindMsgController.java | 8 +++++++- .../resources/mybatis/mapper/inv/InvRemindMsgDao.xml | 12 ++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inv/InvRemindMsgController.java b/src/main/java/com/glxp/api/controller/inv/InvRemindMsgController.java index 95509b00..61896fd7 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvRemindMsgController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvRemindMsgController.java @@ -3,6 +3,7 @@ package com.glxp.api.controller.inv; import com.github.pagehelper.PageInfo; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.controller.BaseController; import com.glxp.api.req.inv.FilterInvRemindMsgRequest; import com.glxp.api.res.inv.InvRemindMsgResponse; import com.glxp.api.service.inv.InvRemindMsgService; @@ -18,7 +19,7 @@ import java.util.List; */ @Slf4j @RestController -public class InvRemindMsgController { +public class InvRemindMsgController extends BaseController { @Resource private InvRemindMsgService invRemindMsgService; @@ -31,6 +32,11 @@ public class InvRemindMsgController { */ @GetMapping("/udiwms/inv/remind/msg/filter") public BaseResponse filterList(FilterInvRemindMsgRequest filterInvRemindMsgRequest) { + + if (!isHosUser()) { + filterInvRemindMsgRequest.setSupId(getCustomerId()); + + } List list = invRemindMsgService.filterList(filterInvRemindMsgRequest); PageInfo pageInfo = new PageInfo<>(list); return ResultVOUtils.page(pageInfo); diff --git a/src/main/resources/mybatis/mapper/inv/InvRemindMsgDao.xml b/src/main/resources/mybatis/mapper/inv/InvRemindMsgDao.xml index e7bbbb67..831a044f 100644 --- a/src/main/resources/mybatis/mapper/inv/InvRemindMsgDao.xml +++ b/src/main/resources/mybatis/mapper/inv/InvRemindMsgDao.xml @@ -27,8 +27,8 @@ (select `name` from auth_space where `code` = irm.invSpaceCode and invCode = irm.invCode) invSpaceName, (select `name` from basic_corp where erpId = irm.supId) supName from inv_remind_msg irm - left join basic_udirel bu on bu.id = irm.relId - left join basic_products bp on bp.uuid = bu.uuid + left join basic_udirel bu on bu.id = irm.relId + left join basic_products bp on bp.uuid = bu.uuid AND irm.relId = #{relId} @@ -54,12 +54,16 @@ AND type = #{type} + + AND irm.supId = #{supId} + order by irm.updateTime desc - \ No newline at end of file +