From a80b4a7eb099390bb53c967126fa97b30568e1a3 Mon Sep 17 00:00:00 2001 From: jinlin <jinlin> Date: 星期二, 01 四月 2025 10:01:38 +0800 Subject: [PATCH] 修改 --- src/main/java/com/example/client/service/SubunitService.java | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/example/client/service/SubunitService.java b/src/main/java/com/example/client/service/SubunitService.java index e6161b0..51c101e 100644 --- a/src/main/java/com/example/client/service/SubunitService.java +++ b/src/main/java/com/example/client/service/SubunitService.java @@ -66,7 +66,7 @@ JComboBoxItem[] teamList = sysTeamGroupClassService.getTeamList(null); JComboBoxItem[] cabinList = cabinService.getList(); String[] typeList = new String[]{ - "鏀硅", "鍔犺", "鎹㈣", "鏀硅繘鎬т慨鐞�","" + "","鏀硅", "鍔犺", "鎹㈣", "淇悊","鏀硅繘鎬т慨鐞�" }; List<DjJdgzShip> shipList = djJdgzShipService.getList(); Map<String, Long> shipMap = new HashMap<>(); @@ -122,6 +122,11 @@ List<ColumnDto> columnDto = new ArrayList<>(); list = level3Service.getList(null, deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0],null); + if (list == null || list.size() == 0) { + JOptionPane.showMessageDialog(null, "杩樻湭褰曞叆涓夌骇缃戠粶鍥炬暟鎹�", "鎻愮ず", JOptionPane.WARNING_MESSAGE); + return null; + } + columnDto.add(new ColumnDto("搴忓彿", "", 60, "autoCreate", false, null, null)); columnDto.add(new ColumnDto("璁惧鍚嶇О", "name", 152, null, false, null, null)); columnDto.add(new ColumnDto("閮ㄩ棬", "deptId", 152, "dict", false, null, deptList)); -- Gitblit v1.9.1