Administrator
/
FenXiNspJavaMain
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

小程序增加租戶

This commit is contained in:
zhangyue 2026-07-31 14:52:50 +08:00
parent a182acff73
commit 6f67ad062f
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonP2ServiceImpl.java
View File

@ -534,13 +534,17 @@ public class IotCommonP2ServiceImpl {
for (String s : datas.keySet()) { for (String s : datas.keySet()) {
List<String> survData = datas.get(s); List<String> survData = datas.get(s);
if(survData!=null && !survData.isEmpty()){ if(survData!=null && !survData.isEmpty()){
List<String> yesterData = survData.subList(yesterDataCounts,survData.size()); List<String> finalData = new ArrayList<>();
if(survData.size() > yesterDataCounts){
finalData = survData.subList(yesterDataCounts,survData.size());
}
//拼接新旧数据 //拼接新旧数据
if(curDatas!=null) { if(curDatas!=null) {
List<String> itemCurData = curDatas.get(s); List<String> itemCurData = curDatas.get(s);
yesterData.addAll(itemCurData); finalData.addAll(itemCurData);
} }
newData.put(s,yesterData); newData.put(s,finalData);
} }
} }
} }