From cd331e00e00ed7a800ee9bf027c755bb918ab0cf Mon Sep 17 00:00:00 2001
From: wanglei <3085637232@qq.com>
Date: Fri, 12 Dec 2025 21:16:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AE=A1=E7=90=86=E5=91=98?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/campus/water/entity/Admin.java    | 13 ++++++-------
 .../java/com/campus/water/service/AdminService.java |  4 ----
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/campus/water/entity/Admin.java b/src/main/java/com/campus/water/entity/Admin.java
index 2b84886..d75431c 100644
--- a/src/main/java/com/campus/water/entity/Admin.java
+++ b/src/main/java/com/campus/water/entity/Admin.java
@@ -1,20 +1,19 @@
 package com.campus.water.entity;
 
+import jakarta.persistence.*;
 import lombok.Data;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+
 import java.time.LocalDateTime;
+import org.hibernate.annotations.GenericGenerator;
 
 @Data
 @Entity
 @Table(name = "admin")
 public class Admin {
     @Id
-    @Column(name = "admin_id", length = 50)
+    @GeneratedValue(generator = "uuid")
+    @GenericGenerator(name = "uuid", strategy = "org.hibernate.id.UUIDGenerator")
+    @Column(name = "admin_id", length = 50, nullable = false)
     private String adminId;
 
     @Column(name = "admin_name", length = 50)
diff --git a/src/main/java/com/campus/water/service/AdminService.java b/src/main/java/com/campus/water/service/AdminService.java
index 248cfce..6f319bb 100644
--- a/src/main/java/com/campus/water/service/AdminService.java
+++ b/src/main/java/com/campus/water/service/AdminService.java
@@ -49,10 +49,6 @@ public class AdminService {
      * 新增/修改管理员（支持指定角色）
      */
     public Admin saveAdmin(Admin admin) {
-        // 新增：校验adminId非空
-        if (admin.getAdminId() == null || admin.getAdminId().isEmpty()) {
-            throw new IllegalArgumentException("管理员ID（adminId）不能为空");
-        }
         admin.setUpdatedTime(LocalDateTime.now());
         if (admin.getCreatedTime() == null) {
             admin.setCreatedTime(LocalDateTime.now());
-- 
2.34.1