suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat：bug修复

Browse Source
This commit is contained in:
suzhuhong
2026-04-24 18:48:44 +08:00
parent 449f409522
commit 19f119bbc6
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
coolstore-partner-service/src/main/java/com/cool/store/service/impl/AdjustmentOrderServiceImpl.java
View File

@@ -184,13 +184,6 @@ public class AdjustmentOrderServiceImpl implements AdjustmentOrderService {
@Override @Override
public PageInfo<AdjustmentOrderResponse> page(AdjustmentOrderPageRequest request, String userId) { 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()); PageHelper.startPage(request.getPageNum(), request.getPageSize());
List<AdjustmentOrderResponse> list = adjustmentOrderDAO.pageQuery(request); List<AdjustmentOrderResponse> list = adjustmentOrderDAO.pageQuery(request);
dictService.fillDictField(list); dictService.fillDictField(list);
@@ -418,13 +411,6 @@ public class AdjustmentOrderServiceImpl implements AdjustmentOrderService {
@Override @Override
public Long pageCount(AdjustmentOrderPageRequest request,LoginUserInfo user) { 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); return adjustmentOrderDAO.pageCount(request);
} }