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/Login.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/example/client/Login.java b/src/main/java/com/example/client/Login.java
index 45af729..8339a98 100644
--- a/src/main/java/com/example/client/Login.java
+++ b/src/main/java/com/example/client/Login.java
@@ -4,7 +4,7 @@
import com.example.client.utils.GBC;
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.beans.factory.annotation.Value;
@@ -152,6 +152,7 @@
user = userService.login(name, str);
exist = user.getExist();
Boolean exit2 = true;
+ Boolean exit3 = true;
if (StringUtils.isNotBlank(user.getTeamgroup())) {
if (StringUtils.isNotBlank(finalTeamGroup1) && !finalTeamGroup1.equals("null")) {
if (!finalTeamGroup1.contains(user.getTeamgroup())) {
@@ -159,10 +160,19 @@
}
}
}
+ if (user.getNickName().equals("宸ヤ綔缁�")){
+ if(!"宸ヤ綔缁�".equals(finalSite)){
+ exit3 = false;
+ }
+ }
if (exist) {
if (!exit2) {
JOptionPane.showMessageDialog(null, "褰撳墠鏈哄櫒涓嶆敮鎸佽涓撲笟鐢ㄦ埛鐧诲綍", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
+ return;
+ }
+ if (!exit3) {
+ JOptionPane.showMessageDialog(null, "褰撳墠鏈哄櫒涓嶆敮鎸佸伐浣滅粍鐢ㄦ埛鐧诲綍", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
return;
}
try {
@@ -188,10 +198,9 @@
} catch (IOException ep) {
ep.printStackTrace();
}
- user.setBoatfleet(finalTeam);
- CacheUtils.put("user", "user", user);
- CacheUtils.put("site", "site", finalSite);
- CacheUtils.put("teamGroup", "teamGroup", finalTeamGroup);
+ user.setBoatFleet(finalTeam);
+ UserAndSiteUtils.put("user", "user", user);
+ UserAndSiteUtils.put("site", "site", finalSite);
main.Start(role, user.getId());
frame.dispose();
} else {
--
Gitblit v1.9.1