Merge branch 'haucheng_panzhihua' into huacheng_test

zhaozhengjie

2022-09-17 fe1a0613d48e9b76b474d22073e72feda23b0d5c

 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;