Skip to content

W
work_service
Commit c5d914e4 authored by cq990612's avatar cq990612
Browse files
Options

优化代码结构

parent 8f945e10
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkProjectServiceImpl.java
View file @ c5d914e4
...@@ -319,13 +319,13 @@ public class WorkProjectServiceImpl implements WorkProjectService { ...@@ -319,13 +319,13 @@ public class WorkProjectServiceImpl implements WorkProjectService {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_PROJECT_IS_NULL); throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_PROJECT_IS_NULL);
} }
for (WorkProject workProject1 : workProjects) { for (WorkProject workProject1 : workProjects) {
if (workProject1.getId().equals(workProject.getId())) { if (modifyProjectVo.getProjectId().equals(workProject.getId())) {
continue; continue;
} }
if (modifyProjectVo.getOaProjectId().equals(workProject.getOaProjectId())) { if (modifyProjectVo.getOaProjectId().equals(workProject1.getOaProjectId())) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.ITEMOADUPLICATE); 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); throw new BaseCustomException(BASE_RESP_CODE_ENUM.DUPLICATEPROJECTNAME);
} }
} }
...@@ -552,12 +552,12 @@ public class WorkProjectServiceImpl implements WorkProjectService { ...@@ -552,12 +552,12 @@ public class WorkProjectServiceImpl implements WorkProjectService {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_PROJECT_IS_NULL); throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_PROJECT_IS_NULL);
} }
for (WorkProject workProject : workProjects) { for (WorkProject workProject : workProjects) {
if (createProjectVo.getOaProjectId().equals(workProject.getOaProjectId())) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.ITEMOADUPLICATE);
}
if (createProjectVo.getProjectName().equals(workProject.getProjectName())) { if (createProjectVo.getProjectName().equals(workProject.getProjectName())) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.DUPLICATEPROJECTNAME); throw new BaseCustomException(BASE_RESP_CODE_ENUM.DUPLICATEPROJECTNAME);
} }
if (createProjectVo.getOaProjectId().equals(workProject.getOaProjectId())) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.ITEMOADUPLICATE);
}
} }
// 插入项目信息 // 插入项目信息
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment