diff --git a/shuili-common/src/main/java/com/shuili/common/exception/file/InvalidExtensionException.java b/shuili-common/src/main/java/com/shuili/common/exception/file/InvalidExtensionException.java
index 3a961d3d..ce7b321b 100644
--- a/shuili-common/src/main/java/com/shuili/common/exception/file/InvalidExtensionException.java
+++ b/shuili-common/src/main/java/com/shuili/common/exception/file/InvalidExtensionException.java
@@ -18,7 +18,7 @@ public class InvalidExtensionException extends FileUploadException
 
     public InvalidExtensionException(String[] allowedExtension, String extension, String filename)
     {
-        super("filename : [" + filename + "], extension : [" + extension + "], allowed extension : [" + Arrays.toString(allowedExtension) + "]");
+        super("文件名 : [" + filename + "], 该文件格式不支持, 支持的文件类型 : [" + Arrays.toString(allowedExtension) + "]");
         this.allowedExtension = allowedExtension;
         this.extension = extension;
         this.filename = filename;
diff --git a/shuili-framework/src/main/java/com/shuili/common/exception/InvalidExtensionException.java b/shuili-framework/src/main/java/com/shuili/common/exception/InvalidExtensionException.java
index 21eecee7..8f4fa5ad 100644
--- a/shuili-framework/src/main/java/com/shuili/common/exception/InvalidExtensionException.java
+++ b/shuili-framework/src/main/java/com/shuili/common/exception/InvalidExtensionException.java
@@ -18,7 +18,7 @@ public class InvalidExtensionException extends FileUploadException
 
     public InvalidExtensionException(String[] allowedExtension, String extension, String filename)
     {
-        super("filename : [" + filename + "], extension : [" + extension + "], allowed extension : [" + Arrays.toString(allowedExtension) + "]");
+        super("文件名 : [" + filename + "], 该文件格式不支持, 支持的文件类型 : [" + Arrays.toString(allowedExtension) + "]");
         this.allowedExtension = allowedExtension;
         this.extension = extension;
         this.filename = filename;
diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcdaMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcdaMapper.java
index 92bcbc14..fef24b0e 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcdaMapper.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcdaMapper.java
@@ -30,7 +30,7 @@ public interface BsSgcSzGcdaMapper extends BaseMapper<BsSgcSzGcda> {
             "and waga_name like concat('%', #{dto.wagaName}, '%') ",
             "</if>",
             "<if test='dto.wagaType != null and dto.wagaType != \"\"'>",
-            "and waga_type = #{dto.wagaType} ",
+            "and  FIND_IN_SET(#{dto.wagaType} , REPLACE(REPLACE(REPLACE(WAGA_TYPE, '[', ''), ']', ''), '\"', '')) ",
             "</if>",
             "<if test='dto.adcd!= null and dto.adcd != \"\"'>",
             "and adcd = #{dto.adcd} ",
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfDangerousTaskService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfDangerousTaskService.java
index b560f1a2..27f1dee1 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfDangerousTaskService.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfDangerousTaskService.java
@@ -1,5 +1,6 @@
 package com.kms.yxgh.df.service;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -46,13 +47,17 @@ public class DfDangerousTaskService extends BaseService<DfDangerousTaskMapper, D
 
     @Transactional(rollbackFor = Exception.class)
     public DfDangerousTaskDto add(DfDangerousTaskDto dto) {
+        if (!checkNameDistinct(dto.getId(), dto.getName())) {
+            throw new SzException("该任务名称已存在");
+        }
+        if(StringUtils.isBlank(dto.getDikeCode())){
+            throw new SzException("请选择堤防！");
+        }
+
         DfDangerousTask dfDangerousTask = BeanCopyUtils.copy(dto, DfDangerousTask.class);
         // 根据dikeCode循环分割获取批量新增
         String[] dikeCodes = dto.getDikeCode().split(",");
         String[] dikeNames = dto.getDikeName().split(",");
-        if(StringUtils.isBlank(dto.getDikeCode())){
-            throw new SzException("请选择堤防！");
-        }
         for (int i = 0; i < dikeCodes.length; i++) {
             String name = dto.getName();
             if (dikeCodes.length > 1) {
@@ -65,6 +70,13 @@ public class DfDangerousTaskService extends BaseService<DfDangerousTaskMapper, D
         return BeanCopyUtils.copy(dfDangerousTask, DfDangerousTaskDto.class);
     }
 
+    private boolean checkNameDistinct(String id, String name) {
+        Wrapper<DfDangerousTask> wp = Wrappers.<DfDangerousTask>lambdaQuery()
+                .eq(DfDangerousTask::getName, name)
+                .ne(StringUtils.isNotEmpty(id), DfDangerousTask::getId, id);
+        return this.getBaseMapper().selectCount(wp) <= 0;
+    }
+
     @Transactional(rollbackFor = Exception.class)
     public Boolean deleteById(String id) {
         return this.removeById(id);
@@ -72,6 +84,9 @@ public class DfDangerousTaskService extends BaseService<DfDangerousTaskMapper, D
 
     @Transactional(rollbackFor = Exception.class)
     public DfDangerousTaskDto modify(DfDangerousTaskDto dto) {
+        if (!checkNameDistinct(dto.getId(), dto.getName())) {
+            throw new SzException("该任务名称已存在");
+        }
         DfDangerousTask dfDangerousTask = BeanCopyUtils.copy(dto, DfDangerousTask.class);
         this.updateById(dfDangerousTask);
         return BeanCopyUtils.copy(dfDangerousTask, DfDangerousTaskDto.class);
diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzDangerousTaskService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzDangerousTaskService.java
index 242f4333..aa0b7819 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzDangerousTaskService.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzDangerousTaskService.java
@@ -1,5 +1,6 @@
 package com.kms.yxgh.sz.service;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -46,13 +47,17 @@ public class SzDangerousTaskService extends BaseService<SzDangerousTaskMapper, S
 
     @Transactional(rollbackFor = Exception.class)
     public SzDangerousTaskDto add(SzDangerousTaskDto dto) {
+        if (!checkNameDistinct(dto.getId(), dto.getName())) {
+            throw new SzException("该任务名称已存在");
+        }
+        if(StringUtils.isBlank(dto.getWagaCode())){
+            throw new SzException("请选择水闸！");
+        }
+
         SzDangerousTask dangerousTask = BeanCopyUtils.copy(dto, SzDangerousTask.class);
         // 根据wagaCode循环分割获取批量新增
         String[] wagaCodes = dto.getWagaCode().split(",");
         String[] wagaNames = dto.getWagaName().split(",");
-        if(StringUtils.isBlank(dto.getWagaCode())){
-            throw new SzException("请选择水闸！");
-        }
         for (int i = 0; i < wagaCodes.length; i++) {
             String name = dto.getName();
             if (wagaCodes.length > 1) {
@@ -65,6 +70,13 @@ public class SzDangerousTaskService extends BaseService<SzDangerousTaskMapper, S
         return BeanCopyUtils.copy(dangerousTask, SzDangerousTaskDto.class);
     }
 
+    private boolean checkNameDistinct(String id, String name) {
+        Wrapper<SzDangerousTask> wp = Wrappers.<SzDangerousTask>lambdaQuery()
+                .eq(SzDangerousTask::getName, name)
+                .ne(StringUtils.isNotEmpty(id), SzDangerousTask::getId, id);
+        return this.getBaseMapper().selectCount(wp) <= 0;
+    }
+
     @Transactional(rollbackFor = Exception.class)
     public Boolean deleteById(String id) {
         return this.removeById(id);
@@ -72,6 +84,9 @@ public class SzDangerousTaskService extends BaseService<SzDangerousTaskMapper, S
 
     @Transactional(rollbackFor = Exception.class)
     public SzDangerousTaskDto modify(SzDangerousTaskDto dto) {
+        if (!checkNameDistinct(dto.getId(), dto.getName())) {
+            throw new SzException("该任务名称已存在");
+        }
         SzDangerousTask dangerousTask = BeanCopyUtils.copy(dto, SzDangerousTask.class);
         this.updateById(dangerousTask);
         return BeanCopyUtils.copy(dangerousTask, SzDangerousTaskDto.class);