diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index c73153161..6e11e39fa 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; @@ -68,7 +69,6 @@ import com.jsowell.pile.vo.uniapp.business.BusinessOrderListVO; import com.jsowell.pile.vo.uniapp.business.BusinessOrderQueryResultVO; import com.jsowell.pile.vo.uniapp.customer.*; import com.jsowell.pile.vo.web.*; -import com.jsowell.pile.vo.web.OrderStatisticsVO; import com.jsowell.wxpay.common.WeChatPayParameter; import com.jsowell.wxpay.response.WechatPayRefundRequest; import com.jsowell.wxpay.response.WechatPayRefundResponse; @@ -292,6 +292,9 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { } dto.setStationDeptIds(authorizedMap.getStationDeptIds()); dto.setMerchantDeptIds(authorizedMap.getMerchantDeptIds()); + if (Objects.nonNull(SecurityUtils.getLoginUser())) { + dto.setParams(ImmutableMap.of("roleId", SecurityUtils.getLoginUser().getUserId())); + } return selectOrderBasicInfoList(dto); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/util/UserUtils.java b/jsowell-pile/src/main/java/com/jsowell/pile/util/UserUtils.java index d254a3d8f..31cf7a9d0 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/util/UserUtils.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/util/UserUtils.java @@ -107,6 +107,7 @@ public class UserUtils { if (Objects.isNull(loginUser)) { return resultVO; } + resultVO.setLoginUser(loginUser); // 获取登录用户对应的user对象 SysUser user = loginUser.getUser(); if (Objects.isNull(user)) { diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/LoginUserDetailVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/LoginUserDetailVO.java index 0873bf8e3..902170d89 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/LoginUserDetailVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/LoginUserDetailVO.java @@ -1,5 +1,6 @@ package com.jsowell.pile.vo.base; +import com.jsowell.common.core.domain.model.LoginUser; import lombok.Getter; import lombok.Setter; @@ -11,6 +12,10 @@ import java.util.List; @Getter @Setter public class LoginUserDetailVO { + /** + * 登录用户 + */ + LoginUser loginUser; /** * 有权限的一级运营商idList * 平台级账号有多个一级运营商权限 diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index cc1675c2b..3c22e9b11 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -2004,6 +2004,9 @@ and t1.vin_code = #{vinCode,jdbcType=VARCHAR} + + and t1.review_flag = '1' + and t1.plate_number = #{plateNumber,jdbcType=VARCHAR}