From 612e1cd2237cf7d8b5ce78f55f04e16f592625c6 Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Mon, 6 Nov 2023 16:04:05 +0800 Subject: [PATCH] =?UTF-8?q?debug=20=E6=A0=87=E7=AD=BE=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ningdatech/pmapi/portrait/manage/TagManage.java | 3 ++- .../provincial/service/impl/JoinReviewProvincialBureauServiceImpl.java | 1 + .../pmapi/scheduler/task/CheckProvincialReviewResultTask.java | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/portrait/manage/TagManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/portrait/manage/TagManage.java index 8e964e4..3525413 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/portrait/manage/TagManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/portrait/manage/TagManage.java @@ -65,8 +65,9 @@ public class TagManage { */ public PageVo list(String areaCode, TagPageReq req) { RegionDTO regionDto = regionCacheHelper.getByCodeAndLevel(areaCode, RegionConst.RL_COUNTY); + String regionCode = Objects.nonNull(regionDto) ? regionDto.getRegionCode() : null; LambdaQueryWrapper query = Wrappers.lambdaQuery(Tag.class) - .eq(Objects.nonNull(regionDto),Tag::getAreaCode, regionDto.getRegionCode()) + .eq(Objects.nonNull(regionCode),Tag::getAreaCode, regionCode) .like(StringUtils.isNotBlank(req.getName()),Tag::getName,req.getName()) .orderByDesc(Tag::getUpdateOn); checkAuth(query,LoginUserUtil.loginUserDetail()); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/provincial/service/impl/JoinReviewProvincialBureauServiceImpl.java b/pmapi/src/main/java/com/ningdatech/pmapi/provincial/service/impl/JoinReviewProvincialBureauServiceImpl.java index 611b657..0fae067 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/provincial/service/impl/JoinReviewProvincialBureauServiceImpl.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/provincial/service/impl/JoinReviewProvincialBureauServiceImpl.java @@ -129,6 +129,7 @@ public class JoinReviewProvincialBureauServiceImpl implements IJoinReviewProvinc JSONObject jsonBaby = new JSONObject(); jsonBaby.put("projectId",projectId); + log.info("请求体 :{}",jsonBaby); //发送post请求 RequestEntity requestEntity = RequestEntity .post(url) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CheckProvincialReviewResultTask.java b/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CheckProvincialReviewResultTask.java index 99661f8..fc5f788 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CheckProvincialReviewResultTask.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CheckProvincialReviewResultTask.java @@ -65,6 +65,7 @@ public class CheckProvincialReviewResultTask { .eq(Project::getStatus, ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS.getCode()) .ge(Project::getDeclareAmount, ProjectDeclareConst.Number.DECLARE_AMOUNT_JUDGEMENT) .eq(Project::getAreaCode, RegionConst.RC_LS) + .eq(Project::getNewest,Boolean.TRUE) .orderByAsc(Project::getCreateOn)); log.info("需要去查询省级联审结果的项目 size:{}",projectList.size());