From cc590c7b79497242a61766bd4c0e48012af1fc9b Mon Sep 17 00:00:00 2001
From: Qi <3194726156@qq.com>
Date: Mon, 9 Jun 2025 22:55:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=BB=84=E6=96=B0=E5=A2=9E=EF=BC=9A?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=AF=B9=E5=BA=94=E7=9A=84=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contoller/CeesGroupController.java        | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/contoller/CeesGroupController.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/contoller/CeesGroupController.java
index b60cacda..aabecb2a 100644
--- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/contoller/CeesGroupController.java
+++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/contoller/CeesGroupController.java
@@ -7,10 +7,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.aspect.annotation.PermissionData;
+import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.entity.CeesGroup;
 import org.jeecg.modules.entity.CeesWaiTeacher;
 import org.jeecg.modules.entity.dto.UpdateGroupUserDto;
@@ -41,6 +44,8 @@ public class CeesGroupController extends JeecgController<CeesGroup, ICeesGroupSe
     private ICeesGroupService ceesGroupService;
     @Autowired
     private CeesWaiTeacherMapper ceesWaiTeacherMapper;
+    @Autowired
+    private ISysBaseAPI sysBaseAPI;
 
     /**
      * 分页列表查询
@@ -97,6 +102,21 @@ public class CeesGroupController extends JeecgController<CeesGroup, ICeesGroupSe
     @ApiOperation(value = "分组表-添加", notes = "分组表-添加")
     @PostMapping(value = "/add")
     public Result<String> add(@RequestBody CeesGroup ceesGroup) {
+        if(ceesGroup.getMajorId() == null){
+            LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+            String username = sysUser.getUsername();
+            // 获取角色编码列表
+            List<String> roleCodes =sysBaseAPI.getRolesByUsername(username);
+            if (roleCodes.size() == 1) {
+                try {
+                    Integer majorId = Integer.parseInt(roleCodes.get(0));
+                    ceesGroup.setMajorId(majorId);
+                } catch (NumberFormatException e) {
+                    // 处理异常，说明角色不是纯数字
+                    log.warn("角色编码无法转换为数字: {}", roleCodes.get(0));
+                }
+            }
+        }
         ceesGroupService.save(ceesGroup);
         return Result.OK("添加成功！");
     }