浏览代码

feat(game): 更新运动员和团队编号唯一性校验逻辑

- 修改运动员编号校验提示文案
- 移除运动员姓名和年龄必填校验
-优化运动员编号重复校验逻辑,排除自身记录-优化团队编号重复校验逻辑,排除自身记录- 调整默认环境激活配置位置
zhou 6 天之前
父节点
当前提交
accba3e287

+ 1 - 1
ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java

@@ -104,7 +104,7 @@ public class AuthController {
         Long userId = LoginHelper.getUserId();
         scheduledExecutorService.schedule(() -> {
             SseMessageDto dto = new SseMessageDto();
-            dto.setMessage("欢迎登录RuoYi-Vue-Plus后台管理系统");
+            dto.setMessage("欢迎登录赛事后台管理系统");
             dto.setUserIds(List.of(userId));
             SseMessageUtils.publishMessage(dto);
         }, 5, TimeUnit.SECONDS);

+ 3 - 3
ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/domain/bo/GameAthleteBo.java

@@ -57,13 +57,13 @@ public class GameAthleteBo extends BaseEntity {
     /**
      * 运动员编号
      */
-    @NotBlank(message = "运动员号不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "运动员号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String athleteCode;
 
     /**
      * 姓名
      */
-    @NotBlank(message = "姓名不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "姓名不能为空", groups = { AddGroup.class, EditGroup.class })
     private String name;
 
     /**
@@ -75,7 +75,7 @@ public class GameAthleteBo extends BaseEntity {
     /**
      * 年龄
      */
-    @NotNull(message = "年龄不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "年龄不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long age;
 
     /**

+ 4 - 3
ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/service/impl/GameAthleteServiceImpl.java

@@ -432,9 +432,10 @@ public class GameAthleteServiceImpl implements IGameAthleteService {
         //校验运动员编号是否存在重复值
         if (entity.getAthleteCode() != null){
             List<GameAthlete> list = baseMapper.selectList(new LambdaQueryWrapper<GameAthlete>()
-                .eq(GameAthlete::getAthleteCode, entity.getAthleteCode()));
-            //排除自己
-            if (list.size()>1){
+                .eq(GameAthlete::getAthleteCode, entity.getAthleteCode())
+                .ne(GameAthlete::getAthleteId, entity.getAthleteId())
+            );
+            if (!list.isEmpty()){
                 throw new ServiceException(entity.getName()+"的编号已存在!");
             }
         }

+ 2 - 1
ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/service/impl/GameTeamServiceImpl.java

@@ -271,9 +271,10 @@ public class GameTeamServiceImpl implements IGameTeamService {
             Long count = baseMapper.selectCount(
                 Wrappers.lambdaQuery(GameTeam.class)
                     .eq(GameTeam::getTeamCode, entity.getTeamCode())
+                    .ne(GameTeam::getTeamId, entity.getTeamId())
             );
             //排除自己
-            if (count > 1) {
+            if (count > 0) {
                 throw new ServiceException(entity.getTeamName()+"的编号已存在!");
             }
         }