diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java index 27c259283..93d8329c3 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java @@ -12,6 +12,7 @@ import com.jsowell.common.enums.BusinessType; import com.jsowell.common.enums.ykc.ReturnCodeEnum; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.response.RestApiResponse; +import com.jsowell.common.util.SecurityUtils; import com.jsowell.common.util.YKCUtils; import com.jsowell.common.util.poi.ExcelUtil; import com.jsowell.pile.domain.OrderBasicInfo; @@ -33,6 +34,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.util.List; +import java.util.Objects; /** * 订单Controller @@ -94,6 +96,9 @@ public class OrderBasicInfoController extends BaseController { // 为空表示没有权限,返回空数组 return new AjaxResult(); } + if (Objects.nonNull(SecurityUtils.getLoginUser())) { + dto.setParams(ImmutableMap.of("roleId", SecurityUtils.getLoginUser().getUserId())); + } String deptId = authorizedMap.getDeptId(); if (CollectionUtils.isNotEmpty(authorizedMap.getStationDeptIds())) { // 为站点管理员 diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index 3c22e9b11..4a0a2f552 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -2058,6 +2058,9 @@ and t1.create_time #{endTime,jdbcType=VARCHAR} + + and t1.review_flag = '1' + and t1.settlement_time = ]]> #{startSettleTime,jdbcType=VARCHAR}