Merge branch 'wangdingyi' into 'dev'

任务名称验重

See merge request !349

quality-review/src/main/java/com/ruoyi/service/impl/TaskServiceImpl.java

@@ -8,8 +8,10 @@ import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.DataStatisticsUtils;
+import com.ruoyi.common.constant.HttpStatus;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -156,10 +158,10 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
         }
 
         // TODO 任务名称验重
-//        Long sum = taskMapper.findTaskName(request.getTaskName());
-//        if (sum > 0) {
-//            throw new ServiceException("任务名称重复，请检查", HttpStatus.ERROR);
-//        } else {
+        Long sum = taskMapper.findTaskName(request.getTaskName());
+        if (sum > 0) {
+            throw new ServiceException("任务名称重复，请检查", HttpStatus.ERROR);
+        } else {
 
             SysUser initiator = sysUserService.selectUserById(loginUser.getUserId());
             Standard standard = standardService.findListById(request.getStandardId());
@@ -220,7 +222,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
 
             taskStateFacade.doCreate(task, request.getTaskList());
 
-//        }
+        }
     }
 
     /**
@@ -292,8 +294,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
     public void editTask(TaskEditRequest request) {
 
         // TODO 任务名称验重
-//        Task oldTask = taskMapper.findByName(request.getTaskName());
-//        if (oldTask == null || Objects.equals(oldTask.getId(), request.getId())) {
+        Task oldTask = taskMapper.findByName(request.getTaskName());
+        if (oldTask == null || Objects.equals(oldTask.getId(), request.getId())) {
             // 构建任务创建者
             LoginUser loginUser = SecurityUtils.getLoginUser();
             SysUser initiator = sysUserService.selectUserById(loginUser.getUserId());
@@ -341,9 +343,9 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
 
             // 保存任务关联的文件信息
             saveFileList(request.getFileList(),task);
-//        } else {
-//            throw new ServiceException("任务名称重复，请检查", HttpStatus.ERROR);
-//        }
+        } else {
+            throw new ServiceException("任务名称重复，请检查", HttpStatus.ERROR);
+        }
 
 
     }
@@ -521,10 +523,10 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
     public void temporaryStorageTask(TaskCreateRequest request) {
 
         // TODO 任务名称验重
-//        Long sum = taskMapper.findTaskName(request.getTaskName());
-//        if (sum > 0) {
-//            throw new ServiceException("任务名称重复，请检查", HttpStatus.ERROR);
-//        } else {
+        Long sum = taskMapper.findTaskName(request.getTaskName());
+        if (sum > 0) {
+            throw new ServiceException("任务名称重复，请检查", HttpStatus.ERROR);
+        } else {
             // 构建任务创建者
             LoginUser loginUser = SecurityUtils.getLoginUser();
             TaskGetInfoResponse temporaryStorageTask = taskService.getByUserId(loginUser.getUserId());
@@ -589,7 +591,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
                 saveFileList(request.getFileList(),task);
             }
 
-//        }
+        }
 
     }
 
@@ -601,8 +603,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
     public void editTemporaryStorageTask(TaskEditRequest request) {
 
         // TODO 任务名称验重
-//        Task oldTask = taskMapper.findByName(request.getTaskName());
-//        if (oldTask == null || Objects.equals(oldTask.getId(), request.getId())) {
+        Task oldTask = taskMapper.findByName(request.getTaskName());
+        if (oldTask == null || Objects.equals(oldTask.getId(), request.getId())) {
             // 构建任务创建者
             LoginUser loginUser = SecurityUtils.getLoginUser();
             SysUser initiator = sysUserService.selectUserById(loginUser.getUserId());
@@ -652,9 +654,9 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
 
             // 保存任务关联的文件信息
             saveFileList(request.getFileList(),task);
-//        } else {
-//            throw new ServiceException("任务名称重复，请检查", HttpStatus.ERROR);
-//        }
+        } else {
+            throw new ServiceException("任务名称重复，请检查", HttpStatus.ERROR);
+        }
 
     }