diff --git a/cloud-mart-common/src/main/java/com/muyu/domain/SysUser.java b/cloud-mart-common/src/main/java/com/muyu/domain/SysUser.java new file mode 100644 index 0000000..8007ac9 --- /dev/null +++ b/cloud-mart-common/src/main/java/com/muyu/domain/SysUser.java @@ -0,0 +1,16 @@ +package com.muyu.domain; + +import lombok.Data; + +/** + * @Author:chaiyapeng + * @Package:com.muyu.domain + * @Project:cloud-mart + * @name:SysUser + * @Date:2024/9/3 15:06 + */ +@Data +public class SysUser { + private Long userId; + private String remark; +} diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/mapper/ConnectorMapper.java b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/mapper/ConnectorMapper.java index 010cbf7..95c75a3 100644 --- a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/mapper/ConnectorMapper.java +++ b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/mapper/ConnectorMapper.java @@ -3,6 +3,7 @@ package com.muyu.cloud.mart.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.Connector; import com.muyu.domain.ConnectorUser; +import com.muyu.domain.SysUser; import com.muyu.domain.req.ConnectorUserReq; import org.apache.ibatis.annotations.Mapper; @@ -25,4 +26,6 @@ public interface ConnectorMapper extends BaseMapper { List findConnectorUserList(ConnectorUserReq connectorUserReq); List findApiList(Connector connector); + + SysUser userId(Long userId); } diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/service/impl/ConnectorServiceImpl.java b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/service/impl/ConnectorServiceImpl.java index 42ab52d..c8404c7 100644 --- a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/service/impl/ConnectorServiceImpl.java +++ b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/service/impl/ConnectorServiceImpl.java @@ -8,7 +8,9 @@ import com.muyu.common.core.domain.Result; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.domain.Connector; import com.muyu.domain.ConnectorUser; +import com.muyu.domain.SysUser; import com.muyu.domain.req.ConnectorUserReq; +import org.apache.catalina.User; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -78,7 +80,9 @@ public class ConnectorServiceImpl extends ServiceImpl> findConnectorUserList(ConnectorUserReq connectorUserReq) { //获取当前用户ID Long userId = SecurityUtils.getUserId(); + SysUser user = connectorMapper.userId(userId); connectorUserReq.setUserId(userId); + connectorUserReq.setRemark(user.getRemark()); List list = connectorMapper.findConnectorUserList(connectorUserReq); return Result.success(list); } diff --git a/cloud-mart-server/src/main/resources/mapper/ConnectorMappers.xml b/cloud-mart-server/src/main/resources/mapper/ConnectorMappers.xml index 8e811f7..039fd32 100644 --- a/cloud-mart-server/src/main/resources/mapper/ConnectorMappers.xml +++ b/cloud-mart-server/src/main/resources/mapper/ConnectorMappers.xml @@ -23,7 +23,7 @@ LEFT JOIN sys_user ON connector_user.user_id = sys_user.user_id LEFT JOIN connector ON connector_user.connector_id = connector.connector_id - + and sys_user.user_id=#{userId} @@ -32,6 +32,9 @@ +