From 30b91395d4a779e18f546bd38282c11df14f2e5f Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 16 九月 2022 11:08:07 +0800
Subject: [PATCH] 数据字典fix

---
 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java
index c43dc17..b19852a 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java
@@ -8,6 +8,7 @@
 import com.gkhy.safePlatform.commons.vo.ResultVO;
 import com.gkhy.safePlatform.commons.vo.SearchResultVO;
 import com.gkhy.safePlatform.emergency.entity.*;
+import com.gkhy.safePlatform.emergency.enums.TeamLevelEnum;
 import com.gkhy.safePlatform.emergency.excepiton.EmergencyException;
 import com.gkhy.safePlatform.emergency.enums.EmergencyResultCodes;
 import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyTeamFileReqDTO;
@@ -85,6 +86,8 @@
     public ResultVO<EmergencyTeamDetailRespDTO> addEmergencyTeam(Long uid, EmergencyTeamReqDTO emergencyTeamReqDTO) {
         //必填项验证
         checkRequired(emergencyTeamReqDTO);
+        // 验证枚举
+        checkEnum(emergencyTeamReqDTO);
 
         Date nowDate = new Date();
         //1.新增应急队伍
@@ -161,6 +164,8 @@
 
     @Override
     public ResultVO updateEmergencyTeam(Long uid, EmergencyTeamReqDTO emergencyTeamReqDTO) {
+        // 验证枚举
+        checkEnum(emergencyTeamReqDTO);
         Date nowDate = new Date();
         //查询是否存在
         EmergencyTeamInfoDetailDO emergencyTeamInfoDetailDO = emergencyTeamInfoService.selectEmergencyTeamById(emergencyTeamReqDTO.getId());
@@ -317,7 +322,7 @@
             throw new EmergencyException(EmergencyResultCodes.TEAM_NAME_NULL);
         }
         //级别
-        if (StringUtils.isBlank(emergencyTeamReqDTO.getTeamLevel())) {
+        if (emergencyTeamReqDTO.getTeamLevel() == null) {
             throw new EmergencyException(EmergencyResultCodes.TEAM_LEVEL_NULL);
         }
         //负责人
@@ -363,4 +368,13 @@
         }
     }
 
+    /**
+     * 枚举验证
+     */
+    private void checkEnum(EmergencyTeamReqDTO emergencyTeamReqDTO) {
+        if (TeamLevelEnum.getByCode(emergencyTeamReqDTO.getTeamLevel()) == null) {
+            throw new EmergencyException(EmergencyResultCodes.TEAM_ENUM_LEVEL_NOT_EXIST);
+        }
+    }
+
 }

--
Gitblit v1.9.2