From eaf842d3224720dca6c0267cf9f13f7b72f49a89 Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期六, 03 一月 2026 00:48:10 +0800
Subject: [PATCH] 调增工单页面，调整登录验证功能
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolPR.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolPR.java
index d5acbfb..c07ff6e 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolPR.java
@@ -49,7 +49,7 @@
//搴撳尯杞崲
Map<String, PatrolSuperData> map = new HashMap<>();
for (Dept dept : deptList) {
- map.put(dept.getId(), new PatrolSuperData(dept.getCompanyId(), dept.getId()));
+ map.put(dept.getId(), new PatrolSuperData(dept.getId().substring(0,(dept.getId().length()-3)), dept.getId()));
}
List<Patrol> weekList = patrolService.getWeekList();
@@ -77,7 +77,14 @@
}
}
- return new ArrayList<>(map.values());
+ ArrayList<PatrolSuperData> list = new ArrayList<>(map.values());
+ Collections.sort(list, new Comparator<PatrolSuperData>() {
+ @Override
+ public int compare(PatrolSuperData o1, PatrolSuperData o2) {
+ return o1.getDeptId().compareTo(o2.getDeptId());
+ }
+ });
+ return list;
}
/*-------------------鐢靛瓙宸℃洿璁板綍涓昏〃淇℃伅--------------------*/
--
Gitblit v1.9.3