From b54e1ad6e9885e5b9745a058fd7b4e7b8a06e2aa Mon Sep 17 00:00:00 2001
From: wanghu <wanghu@yunhai.com>
Date: Thu, 20 Aug 2026 18:35:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=A6=E6=A0=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bschclassmanage/model/dto/SchInfoDto.java       |  2 ++
 .../service/impl/SchInfoService.java                | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/yunhai/bschclassmanage/model/dto/SchInfoDto.java b/src/main/java/com/yunhai/bschclassmanage/model/dto/SchInfoDto.java
index 067e42c..c6a6124 100644
--- a/src/main/java/com/yunhai/bschclassmanage/model/dto/SchInfoDto.java
+++ b/src/main/java/com/yunhai/bschclassmanage/model/dto/SchInfoDto.java
@@ -2,6 +2,7 @@ package com.yunhai.bschclassmanage.model.dto;
 
 import lombok.Data;
 
+import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.List;
@@ -16,6 +17,7 @@ public class SchInfoDto {
     private String name;
 
     @NotNull(message = "父级组ID不能为空")
+    @Min(value=1,message = "父级组ID不能为0")
     private Integer groupId;
 
     /** 学制ID列表（数组） */
diff --git a/src/main/java/com/yunhai/bschclassmanage/service/impl/SchInfoService.java b/src/main/java/com/yunhai/bschclassmanage/service/impl/SchInfoService.java
index da7d836..5c76689 100644
--- a/src/main/java/com/yunhai/bschclassmanage/service/impl/SchInfoService.java
+++ b/src/main/java/com/yunhai/bschclassmanage/service/impl/SchInfoService.java
@@ -1,20 +1,26 @@
 package com.yunhai.bschclassmanage.service.impl;
 
 import com.yunhai.bschclassmanage.Repository.SchInfoRepository;
+import com.yunhai.bschclassmanage.entity.SchDicSubject;
 import com.yunhai.bschclassmanage.entity.SchInfo;
 import com.yunhai.bschclassmanage.enums.NodeType;
 import com.yunhai.bschclassmanage.model.dto.SchInfoDto;
+import com.yunhai.bschclassmanage.model.entityField.EntityFieldNames;
 import com.yunhai.bschclassmanage.model.vo.SelectIntVO;
 import com.yunhai.bschclassmanage.model.vo.oa.SchInfoVO;
 import com.yunhai.bschclassmanage.service.IComSchTreeService;
 import com.yunhai.bschclassmanage.service.ISchInfoService;
 import com.yunhai.bschclassmanage.service.ISendUserBaseService;
+import com.yunhai.bschclassmanage.utils.LogContextHolder;
+import com.yunhai.bschclassmanage.utils.OtherUtil;
 import com.yunhai.bschclassmanage.utils.RedisUtil;
 import com.yunhai.bschclassmanage.utils.UserContext;
 import com.yunhai.platform.openapi.client.YschBaseOpenApi;
 import com.yunhai.platform.utils.exception.DException;
 import com.yunhai.platform.utils.model.BoaGroup;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.hpsf.GUID;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -131,15 +137,17 @@ public class SchInfoService implements ISchInfoService {
                 dto.getName(), dto.getGroupId(), null, NodeType.SCHOOL, schId);
         schId = newSchoolGroup.getId();
 
-        // 添加成功后，判断数据库是否已存在该学校的 sch_info 记录
         // 存在则更新，否则保存
         SchInfoVO existSch = GetSchFirst(schId);
         if (existSch == null) {
+            String uuid= UUID.randomUUID().toString().toUpperCase();
             SchInfo schInfo = new SchInfo();
             schInfo.setSchId(schId);
             schInfo.setName(dto.getName());
+            schInfo.setSchSerId(uuid);
             schInfoRepository.save(schInfo);
         } else {
+
             schInfoRepository.findBySchId(schId).ifPresent(schInfo -> {
                 schInfo.setName(dto.getName());
                 schInfoRepository.save(schInfo);
@@ -148,6 +156,9 @@ public class SchInfoService implements ISchInfoService {
 
         // 调用 ComSchTreeService 清除全区缓存和学校列表缓存
         comSchTreeService.clearCache();
+
+        // 动态写入操作日志描述（@OperationLog 切面优先读取 LogContextHolder）
+        LogContextHolder.setDescription("添加学校" + dto.getName() + "（初始化）成功");
     }
 
 }