From b6ab4fd2b2bd8495703becca8ac0d9734700a6ec Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Thu, 16 Nov 2023 13:46:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=AD=E5=BB=BA=E9=A1=B9=E7=9B=AE=20?= =?UTF-8?q?=E8=83=BD=E5=85=B3=E8=81=94=E7=9A=84=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ningdatech/pmapi/projectdeclared/manage/ConstructionManage.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ConstructionManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ConstructionManage.java index d9bd4a2..08a2b31 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ConstructionManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ConstructionManage.java @@ -135,11 +135,13 @@ public class ConstructionManage { VUtils.isTrue(Objects.isNull(user)).throwMessage("获取登录用户失败!"); LambdaQueryWrapper query = ProjectHelper.projectQuery(req); //建设中状态以后的 都是 - query.gt(Project::getStatus, ProjectStatusEnum.UNDER_CONSTRUCTION.getCode()); + query.and(q1 -> q1.gt(Project::getStatus, ProjectStatusEnum.UNDER_CONSTRUCTION.getCode()) + .or(q2 -> q2.eq(Project::getStatus, ProjectStatusEnum.UNDER_CONSTRUCTION.getCode()) + .isNotNull(Project::getContractAmount))); query.eq(Project::getNewest, Boolean.TRUE); //只能看自己单位的 query.eq(Project::getBuildOrgCode,user.getEmpPosUnitCode()); - query.orderByAsc(Project::getTransactionTime); + query.orderByAsc(Project::getUpdateOn); Page page = projectService.page(req.page(), query); if (CollUtil.isEmpty(page.getRecords())) {