优化代码结构

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

@@ -316,14 +316,15 @@ public class WorkProjectServiceImpl implements WorkProjectService {
         if (CollectionUtils.isEmpty(workProjects)) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_PROJECT_IS_NULL);
         }
+
         for (WorkProject workProject1 : workProjects) {
-            if (workProject1.getId().equals(modifyProjectVo.getProjectId())) {
+            if (modifyProjectVo.getProjectId().equals(workProject1.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);
             }