diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/ConstructionManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/ConstructionManage.java index 927b557..8477802 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/ConstructionManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/ConstructionManage.java @@ -310,7 +310,9 @@ public class ConstructionManage { query.eq(Project::getStage, ProjectStatus.PROJECT_APPROVED.getCode()); query.eq(Project::getNewest, Boolean.TRUE); //只能看自己单位的 - query.eq(Project::getBuildOrgCode, user.getMhUnitIdStr()); + if (!user.getSuperAdmin()) { + query.eq(Project::getBuildOrgCode, user.getMhUnitIdStr()); + } query.orderByAsc(Project::getDeliveryTime); Page page = projectService.page(req.page(), query); long total; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/FinalAcceptanceManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/FinalAcceptanceManage.java index 6ebbf2a..71f524a 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/FinalAcceptanceManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/FinalAcceptanceManage.java @@ -113,7 +113,9 @@ public class FinalAcceptanceManage { if (projectIds.isEmpty()) { return PageVo.empty(); } - query.eq(Project::getBuildOrgCode, user.getMhUnitIdStr()); + if (!user.getRegionAdmin()) { + query.eq(Project::getBuildOrgCode, user.getMhUnitIdStr()); + } query.in(Project::getId, projectIds); query.eq(Project::getStage, ProjectStatus.PROJECT_APPROVED.getCode()); query.eq(Project::getNewest, Boolean.TRUE); diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/service/impl/PurchaseServiceImpl.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/service/impl/PurchaseServiceImpl.java index 3b8c783..7722cb8 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/service/impl/PurchaseServiceImpl.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/service/impl/PurchaseServiceImpl.java @@ -24,7 +24,6 @@ import com.hz.pm.api.projectlib.service.IProjectService; import com.hz.pm.api.user.helper.MhUnitCache; import com.hz.pm.api.user.security.model.UserFullInfoDTO; import com.hz.pm.api.user.util.LoginUserUtil; -import com.ningdatech.basic.model.PageVo; import com.ningdatech.basic.util.CollUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -36,7 +35,7 @@ import java.util.stream.Collectors; /** *

- * 服务实现类 + * 服务实现类 *

* * @author zpf @@ -63,12 +62,12 @@ public class PurchaseServiceImpl extends ServiceImpl .le(req.getCreateOnMax() != null, Purchase::getCreateOn, req.getCreateOnMax()) .ge(req.getCreateOnMin() != null, Purchase::getCreateOn, req.getCreateOnMin()) .eq(req.getStatus() != null, Purchase::getXcfhxApplyStatus, req.getStatus()) - .eq(req.getSourceType() != null,Purchase::getSourceType,req.getSourceType()) + .eq(req.getSourceType() != null, Purchase::getSourceType, req.getSourceType()) .orderByDesc(Purchase::getCreateOn); if (Boolean.TRUE.equals(req.getFinished())) { query.eq(Purchase::getXcfhxApplyStatus, TenderXcfhxApplyStatus.XCFHX_APPLY_PASSED.getCode()); - } else if (Boolean.FALSE.equals(req.getFinished())){ + } else if (Boolean.FALSE.equals(req.getFinished())) { query.ne(Purchase::getXcfhxApplyStatus, TenderXcfhxApplyStatus.XCFHX_APPLY_PASSED.getCode()); } UserFullInfoDTO user = userInfoHelper.getUserFullInfo(LoginUserUtil.getUserId()); @@ -80,8 +79,8 @@ public class PurchaseServiceImpl extends ServiceImpl if (CollUtil.isNotEmpty(purchases)) { Set projectIds = CollUtils.fieldSet(purchases, Purchase::getProjectId); List projects = projectIds.isEmpty() ? Lists.newArrayList() : projectService.list(Wrappers.lambdaQuery(Project.class) - .in(Project::getId,projectIds) - .like(StringUtils.isNotBlank(req.getProjectName()),Project::getProjectName,req.getProjectName())); + .in(Project::getId, projectIds) + .like(StringUtils.isNotBlank(req.getProjectName()), Project::getProjectName, req.getProjectName())); Map projectMap = CollUtils.listToMap(projects, Project::getId); Map contractMap = projectIds.isEmpty() ? Maps.newHashMap() : contractService.listByProjectIds(projectIds); @@ -103,17 +102,17 @@ public class PurchaseServiceImpl extends ServiceImpl Contract contract = contractMap.get(w.getId()); if (contract != null) { - if(Objects.nonNull(req.getAmountStart()) && Objects.nonNull(contract.getTotalAmount()) - && req.getAmountStart().compareTo(contract.getTotalAmount()) > 0){ + if (Objects.nonNull(req.getAmountStart()) && Objects.nonNull(contract.getTotalAmount()) + && req.getAmountStart().compareTo(contract.getTotalAmount()) > 0) { return null; } - if(Objects.nonNull(req.getAmountEnd()) && Objects.nonNull(contract.getTotalAmount()) - && req.getAmountEnd().compareTo(contract.getTotalAmount()) < 0){ + if (Objects.nonNull(req.getAmountEnd()) && Objects.nonNull(contract.getTotalAmount()) + && req.getAmountEnd().compareTo(contract.getTotalAmount()) < 0) { return null; } item.setContractAmount(contract.getTotalAmount()); - }else{ - if(Objects.nonNull(req.getAmountStart()) || Objects.nonNull(req.getAmountEnd())){ + } else { + if (Objects.nonNull(req.getAmountStart()) || Objects.nonNull(req.getAmountEnd())) { return null; } } @@ -123,6 +122,7 @@ public class PurchaseServiceImpl extends ServiceImpl return others; } + @Override public boolean buildPurchaseQueryPermission(LambdaQueryWrapper query, UserFullInfoDTO user) { boolean queryState = true; Optional datascope = DataScopeUtil.getCurrentUserDataScopeHasUserId(user);