优化代码结构

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

@@ -589,12 +589,9 @@ public class WorkProjectServiceImpl implements WorkProjectService {
             if (StringUtils.isBlank(modifyProjectVo.getDeptIdReason())) {
                 throw new BaseCustomException(BASE_RESP_CODE_ENUM.REASON_CANNOT_BE_EMPTY);
             }
-           /* if () {
-                throw new BaseCustomException(BASE_RESP_CODE_ENUM.theNewContent_IsEqual_ToTheOriginal_Content);
-            }*/
         }
 
-        System.out.println("1111111111");
+
         // 校验开始时间
         if (null != modifyProjectVo.getStartTime()) {
             if (StringUtils.isBlank(modifyProjectVo.getStartTimeReason())) {
@@ -613,7 +610,7 @@ public class WorkProjectServiceImpl implements WorkProjectService {
                 throw new BaseCustomException(BASE_RESP_CODE_ENUM.theNewContent_IsEqual_ToTheOriginal_Content);
             }
         }
-        System.out.println("22222222");
+
         // 校验结束时间
         if (null != modifyProjectVo.getEndTime()) {
             if (StringUtils.isBlank(modifyProjectVo.getEndTimeReason())) {
@@ -632,7 +629,7 @@ public class WorkProjectServiceImpl implements WorkProjectService {
                 throw new BaseCustomException(BASE_RESP_CODE_ENUM.theNewContent_IsEqual_ToTheOriginal_Content);
             }
         }
-        System.out.println("33333333333");
+
         // 校验成本预算
         if (null != modifyProjectVo.getCostBudget()) {
             if (BigDecimal.ZERO.compareTo(modifyProjectVo.getCostBudget()) > 0) {
@@ -647,20 +644,25 @@ public class WorkProjectServiceImpl implements WorkProjectService {
                 }
             }
         }
-        System.out.println("4444444444");
+
         // oa编号验证
+        if (!StringUtils.isBlank(modifyProjectVo.getOaProjectId())) {
             if (!modifyProjectVo.getOaProjectId().equals(workProject.getOaProjectId())) {
                 if (StringUtils.isBlank(modifyProjectVo.getOaProjectIdReason())) {
                     throw new BaseCustomException(BASE_RESP_CODE_ENUM.REASON_CANNOT_BE_EMPTY);
                 }
             }
+        }
+
         // 项目名称验证
-        if (!workProject.getProjectName().equals(modifyProjectVo.getProjectName())) {
+        if (!StringUtils.isBlank(modifyProjectVo.getProjectName())) {
+            if (!modifyProjectVo.getProjectName().equals(workProject.getProjectName())) {
                 if (StringUtils.isBlank(modifyProjectVo.getProjectNameReason())) {
                     throw new BaseCustomException(BASE_RESP_CODE_ENUM.REASON_CANNOT_BE_EMPTY);
                 }
             }
-        System.out.println("555555555");
+        }
+
         // 校验工时预算
         if (null != modifyProjectVo.getWorkTime()) {
             if (BigDecimal.ZERO.compareTo(modifyProjectVo.getWorkTime()) > 0) {
@@ -676,7 +678,6 @@ public class WorkProjectServiceImpl implements WorkProjectService {
             }
         }
 
-        System.out.println("66666666666");
 
         // 校验负责人
         if (!workProject.getManagerId().equals(modifyProjectVo.getManagerId())) {
@@ -694,7 +695,7 @@ public class WorkProjectServiceImpl implements WorkProjectService {
                 throw new BaseCustomException(BASE_RESP_CODE_ENUM.NOADMIN_ISTRATIVE_RIGHTS);
             }
         }
-        System.out.println("7777777777");
+
 
         if (!(userIds.containsAll(modifyProjectVo.getUserIds()) &&
                 modifyProjectVo.getUserIds().containsAll(userIds))) {
@@ -702,7 +703,7 @@ public class WorkProjectServiceImpl implements WorkProjectService {
                 throw new BaseCustomException(BASE_RESP_CODE_ENUM.REASON_CANNOT_BE_EMPTY);
             }
         }
-        System.out.println("888888888");
+
 
     }
 }