Merge remote-tracking branch 'origin/master'

wuzeyu

2024-05-08 c936441a1288fa252520d1e7639d607caf7ba7b6

 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java

@@ -204,8 +204,9 @@
        try {
            List<Map<String, Object>> list = Optional.ofNullable(intakeControllerSv.getBindsByIntakeId(intakeId)).orElse(new ArrayList<>());
            if(list.size() <= 0) {
                return BaseResponseUtils.buildFail(ProjectResultCode.INTAKE_NO_RECORDS.getMessage());
            }
                //无绑定记录也返回成功 但数据为空
                return BaseResponseUtils.buildSuccess(list);
            }//成功返回绑定记录数据
            return BaseResponseUtils.buildSuccess(list);
        } catch (Exception e) {
            log.error("查询农户异常", e);