From a857feef16fdd2ea9295f0be82a8fdaa34f13595 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 24 四月 2025 18:10:30 +0800
Subject: [PATCH] 修改
---
src/main/java/com/example/client/service/HandoverAddOrUpdate.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/example/client/service/HandoverAddOrUpdate.java b/src/main/java/com/example/client/service/HandoverAddOrUpdate.java
index a0c3fdf..e5155c7 100644
--- a/src/main/java/com/example/client/service/HandoverAddOrUpdate.java
+++ b/src/main/java/com/example/client/service/HandoverAddOrUpdate.java
@@ -2,6 +2,7 @@
import com.example.client.dto.ColumnDto;
import com.example.client.dto.JComboBoxItem;
+import com.example.client.utils.BoxIteUtils;
import com.example.client.utils.CommonTable;
import com.example.client.utils.GBC;
import com.example.client.utils.UploadFile;
@@ -11,6 +12,8 @@
import com.example.server.progressTrack.service.DjJdgzNetworkLevel1Service;
import com.example.server.progressTrack.service.DjJdgzTrackRecordService;
import com.example.server.sysOss.model.SysOss;
+import com.example.server.user.model.SysUser;
+import com.example.server.utils.UserAndSiteUtils;
import org.apache.commons.lang3.StringUtils;
import org.jdesktop.swingx.JXDatePicker;
import org.springframework.beans.factory.annotation.Autowired;
@@ -62,16 +65,16 @@
JLabel JLabel0 = new JLabel("宸ョ▼");
JComboBox<JComboBoxItem> comboBox = new JComboBox<>(projectList);
if(data.getLevel1NetworkId()!=null){
- comboBox.setSelectedItem(new JComboBoxItem(data.getLevel1NetworkId(),data.getProjectName()));
+ comboBox.setSelectedItem(BoxIteUtils.GetSelectItemById(projectList, data.getLevel1NetworkId()));
}
- JLabel JLabel1 = new JLabel("浜ゆ柟鑹囬槦");
+ JLabel JLabel1 = new JLabel("浜ゆ柟T闃�");
JTextField currentTeamDesc = new JTextField(16);
if (StringUtils.isNotBlank(data.getCurrentTeam())) {
currentTeamDesc.setText(data.getCurrentTeam());
}
- JLabel JLabel2 = new JLabel("鎺ユ柟鑹囬槦");
+ JLabel JLabel2 = new JLabel("鎺ユ柟T闃�");
JTextField handoverTeamDesc = new JTextField(16);
if (StringUtils.isNotBlank(data.getHandoverTeam())) {
handoverTeamDesc.setText(data.getHandoverTeam());
@@ -125,7 +128,7 @@
// 灏� JTextArea 娣诲姞鍒� JTabbedPane
tabbedPane.addTab("涓撲笟浜ゆ帴璇存槑", professionalScrollPane);
tabbedPane.addTab("閮ㄩ棬浜ゆ帴璇存槑", departmentScrollPane);
- tabbedPane.addTab("鑹囬槦浜ゆ帴璇存槑", tdScrollPane);
+ tabbedPane.addTab("T闃熶氦鎺ヨ鏄�", tdScrollPane);
if (StringUtils.isNotBlank(data.getProfessExplan())) {
professExplan.setText(data.getProfessExplan());
@@ -175,6 +178,11 @@
saveButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
+ SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
+ if (user==null){
+ JOptionPane.showMessageDialog(null, "鐢ㄦ埛澶辨晥璇烽��鍑哄苟閲嶆柊鐧诲綍", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
+ return;
+ }
JComboBoxItem project = (JComboBoxItem) comboBox.getSelectedItem();
data.setLevel1NetworkId(project.getId());
@@ -191,6 +199,7 @@
handoverManageService.tableModelListener(table,jFrame,list);
frame1.dispose();
jFrame.setEnabled(true);//灏嗕富鐣岄潰鍐嶈缃负鍙搷浣滅殑
+ JOptionPane.showMessageDialog(null, "淇濆瓨鎴愬姛", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
}
});
--
Gitblit v1.9.1