|
@@ -38,12 +38,12 @@ public class MaterialReportServiceImpl implements IMaterialReportService {
|
|
|
List<JSONObject> marketJsonList = new ArrayList<>();
|
|
|
try {
|
|
|
if (Check.isNull(json)) {
|
|
|
- return null;
|
|
|
+ return marketJsonList;
|
|
|
}
|
|
|
|
|
|
String userId = json.getString("userId");
|
|
|
if (Check.isNull(userId)) {
|
|
|
- return null;
|
|
|
+ return marketJsonList;
|
|
|
}
|
|
|
String roleCode = materialReportMapper.getRoleCodeByUserId(userId);
|
|
|
String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
|
|
@@ -56,7 +56,7 @@ public class MaterialReportServiceImpl implements IMaterialReportService {
|
|
|
if (type == 1) { // 今天分时数据
|
|
|
Integer maxHour = materialReportMapper.selectMaxHourByDate(nowDate);
|
|
|
if (Check.isNull(maxHour) || maxHour == 0) {
|
|
|
- return null;
|
|
|
+ return marketJsonList;
|
|
|
}
|
|
|
Integer statHour = maxHour - 1;
|
|
|
paramsMap.put("startDate", nowDate);
|