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/UserAddOrUpdate.java | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 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..71581ce 100644
--- a/src/main/java/com/example/client/service/UserAddOrUpdate.java
+++ b/src/main/java/com/example/client/service/UserAddOrUpdate.java
@@ -14,6 +14,7 @@
import com.example.server.teamGroup.service.SysTeamGroupClassService;
import com.example.server.user.model.SysUser;
import com.example.server.user.service.UserService;
+import com.example.server.utils.UserAndSiteUtils;
import org.apache.commons.lang3.StringUtils;
import org.jdesktop.swingx.JXDatePicker;
import org.springframework.beans.factory.annotation.Autowired;
@@ -56,12 +57,10 @@
JComboBoxItem[] deptList = sysTeamGroupClassService.getDeptList();
- JComboBoxItem[] boatList = boatFleetService.getBoatList();
-
JLabel JLabel0 = new JLabel("鐢ㄦ埛鍚�");
JTextField userName = new JTextField(16);
- if (StringUtils.isNotBlank(data.getUsername())) {
- userName.setText(data.getUsername());
+ if (StringUtils.isNotBlank(data.getUserName())) {
+ userName.setText(data.getUserName());
}
JLabel JLabel1 = new JLabel("鏄电О");
@@ -76,12 +75,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,28 +125,32 @@
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();
+ SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
+ if (user==null){
+ JOptionPane.showMessageDialog(null, "鐢ㄦ埛澶辨晥璇烽��鍑哄苟閲嶆柊鐧诲綍", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
+ return;
+ }
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.setUsername(userName.getText());
+ //data.setBoatfleet(String.valueOf(boat.getId()));
+ data.setUserName(userName.getText());
data.setNickName(nickName.getText());
data.setPassword(passWord.getText());
userService.save(data);
@@ -157,6 +160,7 @@
userManageService.tableModelListener(table,jFrame,list);
frame1.dispose();
jFrame.setEnabled(true);//灏嗕富鐣岄潰鍐嶈缃负鍙搷浣滅殑
+ JOptionPane.showMessageDialog(null, "淇濆瓨鎴愬姛", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
}
});
--
Gitblit v1.9.1