feat:bug修复
This commit is contained in:
@@ -184,13 +184,6 @@ public class AdjustmentOrderServiceImpl implements AdjustmentOrderService {
|
||||
|
||||
@Override
|
||||
public PageInfo<AdjustmentOrderResponse> page(AdjustmentOrderPageRequest request, String userId) {
|
||||
List<String> regionIds = new ArrayList<>();
|
||||
Boolean isAdmin = enterpriseUserRoleDao.checkIsAdmin(userId);
|
||||
//非管理员根据管辖权限查询 管理员查所有
|
||||
if (StringUtils.isNotEmpty(userId)&&!isAdmin){
|
||||
regionIds = userAuthMappingService.getAuthRegionIdAndSubRegionIdByUserId(userId);
|
||||
request.setRegionIds(regionIds);
|
||||
}
|
||||
PageHelper.startPage(request.getPageNum(), request.getPageSize());
|
||||
List<AdjustmentOrderResponse> list = adjustmentOrderDAO.pageQuery(request);
|
||||
dictService.fillDictField(list);
|
||||
@@ -418,13 +411,6 @@ public class AdjustmentOrderServiceImpl implements AdjustmentOrderService {
|
||||
|
||||
@Override
|
||||
public Long pageCount(AdjustmentOrderPageRequest request,LoginUserInfo user) {
|
||||
List<String> regionIds = new ArrayList<>();
|
||||
Boolean isAdmin = enterpriseUserRoleDao.checkIsAdmin(user.getUserId());
|
||||
//非管理员根据管辖权限查询 管理员查所有
|
||||
if (StringUtils.isNotEmpty(user.getUserId())&&!isAdmin){
|
||||
regionIds = userAuthMappingService.getAuthRegionIdAndSubRegionIdByUserId(user.getUserId());
|
||||
request.setRegionIds(regionIds);
|
||||
}
|
||||
return adjustmentOrderDAO.pageCount(request);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user