From 77d58298d00c11ade8862ca8acb0fdef5a45322e Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 21 三月 2025 17:39:38 +0800
Subject: [PATCH] 修改

---
 src/main/java/com/example/client/service/UserAddOrUpdate.java |   23 ++++++++++-------------
 1 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/example/client/service/UserAddOrUpdate.java b/src/main/java/com/example/client/service/UserAddOrUpdate.java
index 305717f..d9fc1bd 100644
--- a/src/main/java/com/example/client/service/UserAddOrUpdate.java
+++ b/src/main/java/com/example/client/service/UserAddOrUpdate.java
@@ -56,8 +56,6 @@
 
         JComboBoxItem[] deptList = sysTeamGroupClassService.getDeptList();
 
-        JComboBoxItem[] boatList = boatFleetService.getBoatList();
-
         JLabel JLabel0 = new JLabel("鐢ㄦ埛鍚�");
         JTextField userName = new JTextField(16);
         if (StringUtils.isNotBlank(data.getUsername())) {
@@ -76,12 +74,12 @@
             passWord.setText(data.getPassword());
         }
 
-        JLabel JLabel3 = new JLabel("鎵�灞濼闃�");
+      /*  JLabel JLabel3 = new JLabel("鎵�灞濼闃�");
         JComboBox<JComboBoxItem> comboBox = new JComboBox<>(boatList);
         if(StringUtils.isNotBlank(data.getBoatfleet())){
             comboBox.setSelectedItem(BoxIteUtils.GetSelectItemById(boatList, data.getBoatFleetId()));
         }
-
+*/
         JLabel JLabel4 = new JLabel("鎵�灞為儴闂�");
         JComboBox<JComboBoxItem> comboBox1 = new JComboBox<>(deptList);
         if(StringUtils.isNotBlank(data.getDept())){
@@ -126,27 +124,26 @@
         frame1.add(JLabel2, new GBC(0, 2, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
         frame1.add(passWord, new GBC(1, 2, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
 
-        frame1.add(JLabel3, new GBC(0, 3, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
+        /*frame1.add(JLabel3, new GBC(0, 3, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
         frame1.add(comboBox, new GBC(1, 3, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
+*/
+        frame1.add(JLabel4, new GBC(0, 3, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
+        frame1.add(comboBox1, new GBC(1, 3, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
 
-        frame1.add(JLabel4, new GBC(0, 4, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
-        frame1.add(comboBox1, new GBC(1, 4, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
+        frame1.add(JLabel5, new GBC(0, 4, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
+        frame1.add(comboBox2, new GBC(1, 4, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
 
-        frame1.add(JLabel5, new GBC(0, 5, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
-        frame1.add(comboBox2, new GBC(1, 5, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
-
-        frame1.add(saveButton, new GBC(0, 6, 1, 1).setWeight(0, 0));
+        frame1.add(saveButton, new GBC(0, 5, 1, 1).setWeight(0, 0));
 
         saveButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                JComboBoxItem boat = (JComboBoxItem) comboBox.getSelectedItem();
                 JComboBoxItem dept = (JComboBoxItem) comboBox1.getSelectedItem();
                 JComboBoxItem team = (JComboBoxItem) comboBox2.getSelectedItem();
 
                 data.setDept(String.valueOf(dept.getId()));
                 data.setTeamgroup(String.valueOf(team.getId()));
-                data.setBoatfleet(String.valueOf(boat.getId()));
+                //data.setBoatfleet(String.valueOf(boat.getId()));
                 data.setUsername(userName.getText());
                 data.setNickName(nickName.getText());
                 data.setPassword(passWord.getText());

--
Gitblit v1.9.1