From 92705ac08a97ddc4904795f024723aab69e1abd8 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期六, 05 四月 2025 21:47:59 +0800
Subject: [PATCH] 修改

---
 src/main/java/com/example/client/service/TeamGroupAddOrUpdate.java |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/example/client/service/TeamGroupAddOrUpdate.java b/src/main/java/com/example/client/service/TeamGroupAddOrUpdate.java
index a6d2fe4..3f56a13 100644
--- a/src/main/java/com/example/client/service/TeamGroupAddOrUpdate.java
+++ b/src/main/java/com/example/client/service/TeamGroupAddOrUpdate.java
@@ -10,7 +10,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.CacheUtils;
+import com.example.server.utils.UserAndSiteUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -53,7 +53,7 @@
 
         JLabel JLabel0 = new JLabel("绫诲瀷");
         JComboBox<String> comboBox1 = new JComboBox<>(typeList);
-        comboBox1.setPreferredSize(new Dimension(185,28));
+        comboBox1.setPreferredSize(new Dimension(185, 28));
         if (StringUtils.isNotBlank(data.getType())) {
             comboBox1.setSelectedItem(data.getType());
         }
@@ -66,11 +66,11 @@
 
         JLabel JLabel4 = new JLabel("鎵�灞為儴闂�");
         JComboBox<JComboBoxItem> comboBox2 = new JComboBox<>(deptList);
-        comboBox2.setPreferredSize(new Dimension(185,28));
+        comboBox2.setPreferredSize(new Dimension(185, 28));
         if (data.getPid() != null) {
-            if (data.getPid()!=0){
+            if (data.getPid() != 0) {
                 comboBox2.setSelectedItem(BoxIteUtils.GetSelectItemById(deptList, data.getPid()));
-            }else {
+            } else {
                 comboBox2.setEditable(false);
             }
         }
@@ -106,8 +106,8 @@
         saveButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                SysUser user = (SysUser) CacheUtils.get("user","user");
-                if (user==null){
+                SysUser user = (SysUser) UserAndSiteUtils.get("user", "user");
+                if (user == null) {
                     JOptionPane.showMessageDialog(null, "鐢ㄦ埛澶辨晥璇烽��鍑哄苟閲嶆柊鐧诲綍", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
                     return;
                 }
@@ -120,7 +120,7 @@
                     data.setSort(sortMax + 100);
                 } else {
                     data.setPid(dept.getId());
-                    sortMax = sysTeamGroupClassService.getSortMax(dept.getId());
+                    sortMax = sysTeamGroupClassService.getSortMax(dept.getId()) == null ? 0 : sysTeamGroupClassService.getSortMax(dept.getId());
                     data.setSort(sortMax + 1);
                 }
 
@@ -130,7 +130,8 @@
 
                 sysTeamGroupClassService.save(data);
 
-                List<SysTeamGroupClass> list = sysTeamGroupClassService.getListByTree();;
+                List<SysTeamGroupClass> list = sysTeamGroupClassService.getListByTree();
+                ;
                 CommonTable.refreshTable(list, columnDto, table);
                 teamGroupManageService.tableModelListener(table, jFrame, list);
                 frame1.dispose();

--
Gitblit v1.9.1