优化代码结构

wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkProjectServiceImpl.java

@@ -312,6 +312,26 @@ public class WorkProjectServiceImpl implements WorkProjectService {
                 userIds.add(user.getId());
             }
         }
+
+        // 判断oa编号、项目名称是否重复,
+        List<WorkProject> workProjects = workProjectMapper.selectList(new QueryWrapper<>());
+        if (CollectionUtils.isEmpty(workProjects)) {
+            throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_PROJECT_IS_NULL);
+        }
+        for (WorkProject workProject1 : workProjects) {
+            if (workProject1.getId().equals(workProject.getId())) {
+                continue;
+            }
+            if (modifyProjectVo.getOaProjectId().equals(workProject.getOaProjectId())) {
+                throw new BaseCustomException(BASE_RESP_CODE_ENUM.ITEMOADUPLICATE);
+            }
+            if (modifyProjectVo.getProjectName().equals(workProject.getProjectName())) {
+                throw new BaseCustomException(BASE_RESP_CODE_ENUM.DUPLICATEPROJECTNAME);
+            }
+        }
+
+
+
         // 验证项目
         verificationItem(modifyProjectVo, workProject, userIds);
 
@@ -526,7 +546,7 @@ public class WorkProjectServiceImpl implements WorkProjectService {
         if (BigDecimal.ZERO.compareTo(createProjectVo.getWorkTime()) > 0 || BigDecimal.ZERO.compareTo(createProjectVo.getCostBudget()) > 0) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.BUDGET_CANNOT_BELESSTHAN_ZERO);
         }
-        // 判断oa编号是否重复
+        // 判断oa编号、项目名称是否重复
         List<WorkProject> workProjects = workProjectMapper.selectList(new QueryWrapper<>());
         if (CollectionUtils.isEmpty(workProjects)) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_PROJECT_IS_NULL);
@@ -535,7 +555,11 @@ public class WorkProjectServiceImpl implements WorkProjectService {
             if (createProjectVo.getOaProjectId().equals(workProject.getOaProjectId())) {
                 throw new BaseCustomException(BASE_RESP_CODE_ENUM.ITEMOADUPLICATE);
             }
+            if (createProjectVo.getProjectName().equals(workProject.getProjectName())) {
+                throw new BaseCustomException(BASE_RESP_CODE_ENUM.DUPLICATEPROJECTNAME);
+            }
         }
+
         // 插入项目信息
         Date date = new Date();
         WorkProject workProject = new WorkProject();