mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-19 18:45:03 +08:00
update
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -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)) {
|
||||
|
||||
@@ -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
|
||||
* 平台级账号有多个一级运营商权限
|
||||
|
||||
@@ -2004,6 +2004,9 @@
|
||||
<if test="vinCode != null and vinCode != ''">
|
||||
and t1.vin_code = #{vinCode,jdbcType=VARCHAR}
|
||||
</if>
|
||||
<if test="params != null and params.roleId != null and params.roleId > 2">
|
||||
and t1.review_flag = '1'
|
||||
</if>
|
||||
<if test="plateNumber != null and plateNumber != ''">
|
||||
and t1.plate_number = #{plateNumber,jdbcType=VARCHAR}
|
||||
</if>
|
||||
|
||||
Reference in New Issue
Block a user