From a3fe79e605b07a5a908599aaa830a0860e9423d2 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 14 五月 2025 17:34:27 +0800
Subject: [PATCH] 修改

---
 src/main/java/com/example/client/service/UserManageService.java |   22 ++++++++++------------
 1 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/example/client/service/UserManageService.java b/src/main/java/com/example/client/service/UserManageService.java
index ceda20b..c0ea12a 100644
--- a/src/main/java/com/example/client/service/UserManageService.java
+++ b/src/main/java/com/example/client/service/UserManageService.java
@@ -71,22 +71,20 @@
 
         JComboBoxItem[] deptList = sysTeamGroupClassService.getDeptList();
 
-        JComboBoxItem[] boatList = boatFleetService.getBoatList();
 
         columnDto = new ArrayList<>();
         //columnDto.add(new ColumnDto("ID", "id", -1, null,false));
-        columnDto.add(new ColumnDto("搴忓彿", "", (width - 10) / 8, "autoCreate", false, null,null));
-        columnDto.add(new ColumnDto("鐢ㄦ埛鍚�", "username", (width - 10) / 8, null, false, null,null));
-        columnDto.add(new ColumnDto("鏄电О", "nickName", (width - 10) / 8, null, false, null,null));
-        columnDto.add(new ColumnDto("瀵嗙爜", "password", (width - 10) / 8, null, false, null,null));
-        columnDto.add(new ColumnDto("鎵�灞濼闃�", "boatFleetId", (width - 10) / 8, "dict", true, null,boatList));
-        columnDto.add(new ColumnDto("鎵�灞為儴闂�", "deptId", (width - 10) / 8, "dict", true, null,deptList));
-        columnDto.add(new ColumnDto("鎵�灞炰笓涓�", "teamgroupId", (width - 10) / 8, "dict", true, null,teamList));
-        columnDto.add(new ColumnDto("鎿嶄綔", "", (width - 10) / 8, "", true, buttonList,null));
+        columnDto.add(new ColumnDto("搴忓彿", "", (width - 10) / 7, "autoCreate", false, null,null));
+        columnDto.add(new ColumnDto("鐢ㄦ埛鍚�", "userName", (width - 10) / 7, null, false, null,null));
+        columnDto.add(new ColumnDto("鏄电О", "nickName", (width - 10) / 7, null, false, null,null));
+        columnDto.add(new ColumnDto("瀵嗙爜", "password", (width - 10) / 7, null, false, null,null));
+        //columnDto.add(new ColumnDto("鎵�灞濼闃�", "boatFleetId", (width - 10) / 8, "dict", true, null,boatList));
+        columnDto.add(new ColumnDto("鎵�灞為儴闂�", "deptId", (width - 10) / 7, "dict", true, null,deptList));
+        columnDto.add(new ColumnDto("鎵�灞炰笓涓�", "teamgroupId", (width - 10) / 7, "dict", true, null,teamList));
+        columnDto.add(new ColumnDto("鎿嶄綔", "", (width - 10) / 7, "", true, buttonList,null));
 
         table = CommonTable.createCommonTable(list, columnDto);
         table.setRowHeight(25);
-        table.setAutoCreateRowSorter(true);
         table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
 
         tableModelListener(table,jFrame,list);
@@ -94,9 +92,9 @@
         btnInsert.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
+                jFrame.setEnabled(false);
                 SysUser data = new SysUser();
                 addOrUpdate.openDialog(data,jFrame, columnDto,table);
-                jFrame.setEnabled(false);
             }
         });
 
@@ -121,9 +119,9 @@
                 Object newValue = table.getModel().getValueAt(row, column);
                 // 杈撳嚭鍙樺寲淇℃伅
                 if (newValue.equals("edit")){
+                    jFrame.setEnabled(false);
                     SysUser data = list.get(row);
                     addOrUpdate.openDialog(data,jFrame, columnDto,table);
-                    jFrame.setEnabled(false);
                 }else if(newValue.equals("del")) {
                     int n = JOptionPane.showConfirmDialog(null, "鏄惁鍒犻櫎?", "鎻愮ず", JOptionPane.YES_NO_OPTION);
                     if (n == 0) {

--
Gitblit v1.9.1