Browse Source

Merge remote-tracking branch 'origin/dev-czh' into dev

dev-lhz
chenzhihang 1 year ago
parent
commit
a0b54850ec
1 changed files with 1 additions and 4 deletions
  1. +1
    -4
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ServiceServiceImpl.java

+ 1
- 4
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ServiceServiceImpl.java View File

@@ -275,10 +275,7 @@ public class ServiceServiceImpl implements ServiceService {
if (StringUtils.isNotEmpty(req)) { if (StringUtils.isNotEmpty(req)) {
Map<String, Object> reqMap = JacksonUtil.parseJSONStr2Map(req); Map<String, Object> reqMap = JacksonUtil.parseJSONStr2Map(req);
if (reqMap.get("code") != null && (Integer) reqMap.get("code") == 200) { if (reqMap.get("code") != null && (Integer) reqMap.get("code") == 200) {
HashMap<String, String> data = (HashMap<String, String>) reqMap.get("data");
data.put("start_time", data.get("end_time"));
data.put("end_time", endTime);
return data;
return (HashMap<String, String>) reqMap.get("data");
} else { } else {
throw new RuntimeException("获取日志失败"); throw new RuntimeException("获取日志失败");
} }


Loading…
Cancel
Save