From fe1a0613d48e9b76b474d22073e72feda23b0d5c Mon Sep 17 00:00:00 2001 From: zhaozhengjie <237651143@qq.com> Date: 星期六, 17 九月 2022 18:57:13 +0800 Subject: [PATCH] Merge branch 'haucheng_panzhihua' into huacheng_test --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java index 33a4e49..f9541e6 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java @@ -577,6 +577,15 @@ return R.ok(); } + @Override + public R checkCommit(Long userId) { + if(userId!=null){ + List<ComActAcidRecord> comActAcidRecords= this.baseMapper.selectList(new QueryWrapper<ComActAcidRecord>().lambda().eq(ComActAcidRecord::getIsDel,0).eq(ComActAcidRecord::getUserId,userId).ge(ComActAcidRecord::getCreateTime, DateUtils.getCurrentDate(DateUtils.yyyyMMdd_format)).eq(ComActAcidRecord::getAcidTest,null)); + return R.ok(comActAcidRecords); + } + return R.ok(); + } + public static void areaCheck(ComCun area,ComStreetDO comStreetDO){ switch (area.getArea()){ case "西区": comStreetDO.setAreaCode(510423); break; -- Gitblit v1.7.1