From bb288009b54b3baa6ccac357a83090c22813ff53 Mon Sep 17 00:00:00 2001 From: houzhongjian <houzhongyi@126.com> Date: 星期五, 13 十二月 2024 10:21:00 +0800 Subject: [PATCH] 1、工作流优化代码更新 2、BeanUtils增加copyProperties方法 3、CollectionUtils增加PageResult方法 4、数据权限sql拼接dept_id in时左右()的处理 5、删除应用时查询菜单bug修复 --- iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java index 3fa6115..fa66d48 100644 --- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java +++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java @@ -303,9 +303,6 @@ return result; } String resultIndex = chartParams.get(CommonConstant.RESULT_INDEX); - if (resultIndex == null) { - return result; - } ItemVO predictItem = mmPredictItemService.getItemByItemNo(itemCode); if (predictItem == null || predictItem.getLastTime() == null) { @@ -327,7 +324,7 @@ List<String> categories = DateUtils.getTimeScale(startTime, endTime, predictItem.getGranularity(), timeFormat); List<String> legend = new ArrayList<>(); - MmItemOutputEntity outPut = mmItemOutputService.getByItemid(predictItem.getId(), resultStr, Integer.parseInt(resultIndex)); + MmItemOutputEntity outPut = mmItemOutputService.getByItemid(predictItem.getId(), resultStr, resultIndex); PreDataViewRespDTO dataView = new PreDataViewRespDTO(); dataView.setItemId(predictItem.getId()); dataView.setItemName(predictItem.getItemName()); -- Gitblit v1.9.3