优化代码结构

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

@@ -319,13 +319,13 @@ public class WorkProjectServiceImpl implements WorkProjectService {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_PROJECT_IS_NULL);
         }
         for (WorkProject workProject1 : workProjects) {
-            if (workProject1.getId().equals(workProject.getId())) {
+            if (modifyProjectVo.getProjectId().equals(workProject.getId())) {
                 continue;
             }
-            if (modifyProjectVo.getOaProjectId().equals(workProject.getOaProjectId())) {
+            if (modifyProjectVo.getOaProjectId().equals(workProject1.getOaProjectId())) {
                 throw new BaseCustomException(BASE_RESP_CODE_ENUM.ITEMOADUPLICATE);
             }
-            if (modifyProjectVo.getProjectName().equals(workProject.getProjectName())) {
+            if (modifyProjectVo.getProjectName().equals(workProject1.getProjectName())) {
                 throw new BaseCustomException(BASE_RESP_CODE_ENUM.DUPLICATEPROJECTNAME);
             }
         }
@@ -552,12 +552,12 @@ public class WorkProjectServiceImpl implements WorkProjectService {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_PROJECT_IS_NULL);
         }
         for (WorkProject workProject : workProjects) {
-            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);
             }
+            if (createProjectVo.getOaProjectId().equals(workProject.getOaProjectId())) {
+                throw new BaseCustomException(BASE_RESP_CODE_ENUM.ITEMOADUPLICATE);
+            }
         }
 
         // 插入项目信息