Browse Source

Merge remote-tracking branch 'origin/master'

syh 5 years ago
parent
commit
d285362d53

+ 3 - 3
module-report/src/main/java/cn/com/ctop/bytedance/service/impl/MaterialReportServiceImpl.java

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