From 789b4991e024674b55ef00897d5100a0c7ea1817 Mon Sep 17 00:00:00 2001
From: chenqi <1799796883@qq.com>
Date: Wed, 24 Mar 2021 17:34:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/utils/exception/BASE_RESP_CODE_ENUM.java          | 2 +-
 .../cn/wisenergy/service/impl/WorkProjectServiceImpl.java    | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/wisenergy-common/src/main/java/cn/wisenergy/common/utils/exception/BASE_RESP_CODE_ENUM.java b/wisenergy-common/src/main/java/cn/wisenergy/common/utils/exception/BASE_RESP_CODE_ENUM.java
index d98363d..dac2d02 100644
--- a/wisenergy-common/src/main/java/cn/wisenergy/common/utils/exception/BASE_RESP_CODE_ENUM.java
+++ b/wisenergy-common/src/main/java/cn/wisenergy/common/utils/exception/BASE_RESP_CODE_ENUM.java
@@ -59,7 +59,7 @@ public enum BASE_RESP_CODE_ENUM {
     WORKDAY_NOT_NULL("637","工时日期不能为空"),
     PROJECT_NOT_NULL("638","项目类型不能为空"),
     NEW_PASSWORD_IS_HTE_SAME_OLD_PASSWORD("639","新密码不能与旧密码相同"),
-    PASSWORD_FORMAT_ERROR("640","密码由6到16位数字组成"),
+    DUPLICATEPROJECTNAME("640","项目/商机名称重复"),
     INCOMPLETE_WORK_ORDER_INFORMATION("621","请填写完整的工单信息"),
     HAVE_ORDER_DELETE("643", "有工单被用户删除，审批失败，请重新审批"),
     ORDER_EXAMINE("644","该工单已经被审批，请刷新查看"),
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkProjectServiceImpl.java b/wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkProjectServiceImpl.java
index f0c74b0..102c6b5 100644
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkProjectServiceImpl.java
+++ b/wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkProjectServiceImpl.java
@@ -533,7 +533,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);
@@ -542,6 +542,9 @@ 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();
-- 
2.18.1