|
@@ -9135,7 +9135,10 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
httpRespMsg.setError("The date range cannot be empty");
|
|
httpRespMsg.setError("The date range cannot be empty");
|
|
return httpRespMsg;
|
|
return httpRespMsg;
|
|
}
|
|
}
|
|
- int organizationId = Integer.parseInt(String.valueOf(memberQueryQuery.get("organizationId")));
|
|
|
|
|
|
+ int organizationId = 0;
|
|
|
|
+ if(null != memberQueryQuery.get("organizationId")){
|
|
|
|
+ organizationId=Integer.parseInt(String.valueOf(memberQueryQuery.get("organizationId")));
|
|
|
|
+ }
|
|
String startDate = String.valueOf(memberQueryQuery.get("startDate"));
|
|
String startDate = String.valueOf(memberQueryQuery.get("startDate"));
|
|
String endDate = String.valueOf(memberQueryQuery.get("endDate"));
|
|
String endDate = String.valueOf(memberQueryQuery.get("endDate"));
|
|
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
|
|
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
|