1、根据id查询后统一校验对象是否存在

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/conversion/OaConversionServiceImpl.java

@@ -160,7 +160,7 @@ public class OaConversionServiceImpl implements OaConversionService {
         if (oaConversion.getId() == null) {
             oaConversionMapper.insert(oaConversion);
         } else {
-            OaConversionDO oaConversionDO = oaConversionMapper.selectById(oaConversion.getId());
+            OaConversionDO oaConversionDO = validateOaConversionExists(oaConversion.getId());
             if (StrUtil.isNotBlank(oaConversionDO.getProcInstId())) {
                 throw exception(ErrorCodeConstants.PROCESS_INSTANCE_CREATE_FAIL_HAS_PROCESS);
             }
@@ -383,7 +383,7 @@ public class OaConversionServiceImpl implements OaConversionService {
         }
 
         OaConversionDO oaConversionNew = BeanUtils.toBean(reCommitReqVO, OaConversionDO.class);
-        OaConversionDO oaConversionOld = oaConversionMapper.selectById(oaConversionNew.getId());
+        OaConversionDO oaConversionOld = validateOaConversionExists(oaConversionNew.getId());
         oaConversionNew.setConversionId(oaConversionOld.getConversionId())
                 .setProcInstId(oaConversionOld.getProcInstId());
 
@@ -440,7 +440,7 @@ public class OaConversionServiceImpl implements OaConversionService {
         Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
         // TODO DP 根据登录人查询出对应的员工信息
 
-        OaConversionDO oaConversionDO = oaConversionMapper.selectById(id);
+        OaConversionDO oaConversionDO = validateOaConversionExists(id);
         if (!DictDataConstants.OA_AUDIT_STATUS_RETURNED.equals(oaConversionDO.getAuditStatus())
                 && !DictDataConstants.OA_AUDIT_STATUS_RECALLED.equals(oaConversionDO.getAuditStatus())) {
             throw exception(ErrorCodeConstants.TASK_CLOSE_NOT_ALLOWED);
@@ -469,7 +469,7 @@ public class OaConversionServiceImpl implements OaConversionService {
     @Override
     public void deleteOaConversion(Long id) {
         // 校验存在
-        validateOaConversionExists(id);
+        validateOaConversionDelete(id);
         // 删除
         oaConversionMapper.deleteById(id);
     }
@@ -480,7 +480,7 @@ public class OaConversionServiceImpl implements OaConversionService {
         Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
         // TODO DP 根据登录人查询出对应的员工信息
 
-        OaConversionDO oaConversionDO = oaConversionMapper.selectById(id);
+        OaConversionDO oaConversionDO = validateOaConversionExists(id);
         OaConversionRespVO oaConversionRespVO = BeanUtils.toBean(oaConversionDO, OaConversionRespVO.class);
         if (oaConversionDO.getDeptId() != null) {
             DeptRespDTO dept = deptApi.getDept(oaConversionDO.getDeptId());
@@ -618,14 +618,18 @@ public class OaConversionServiceImpl implements OaConversionService {
         return getOaConversionPage(pageReqVO);
     }
 
-    private void validateOaConversionExists(Long id) {
+    private void validateOaConversionDelete(Long id) {
+        OaConversionDO oaConversionDO = validateOaConversionExists(id);
+        if (!DictDataConstants.OA_AUDIT_STATUS_STAGING.equals(oaConversionDO.getAuditStatus())) {
+            throw exception(ErrorCodeConstants.DELETE_FAIL_NOT_STAGING);
+        }
+    }
+    private OaConversionDO validateOaConversionExists(Long id) {
         OaConversionDO oaConversionDO = oaConversionMapper.selectById(id);
         if (oaConversionDO == null) {
             throw exception(OA_CONVERSION_NOT_EXISTS);
         }
-        if (!DictDataConstants.OA_AUDIT_STATUS_STAGING.equals(oaConversionDO.getAuditStatus())) {
-            throw exception(ErrorCodeConstants.DELETE_FAIL_NOT_STAGING);
-        }
+        return oaConversionDO;
     }
 
     /**

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/entry/OaEntryServiceImpl.java

@@ -140,7 +140,7 @@ public class OaEntryServiceImpl implements OaEntryService {
         if (oaEntry.getId() == null) {
             oaEntryMapper.insert(oaEntry);
         } else {
-            OaEntryDO oaEntryDO = oaEntryMapper.selectById(oaEntry.getId());
+            OaEntryDO oaEntryDO = validateOaEntryExists(oaEntry.getId());
             if (StrUtil.isNotBlank(oaEntryDO.getProcInstId())) {
                 throw exception(ErrorCodeConstants.PROCESS_INSTANCE_CREATE_FAIL_HAS_PROCESS);
             }
@@ -340,7 +340,7 @@ public class OaEntryServiceImpl implements OaEntryService {
         // TODO DP 根据登录人查询出对应的员工信息
 
         OaEntryDO oaEntryNew = BeanUtils.toBean(reCommitReqVO, OaEntryDO.class);
-        OaEntryDO oaEntryOld = oaEntryMapper.selectById(oaEntryNew.getId());
+        OaEntryDO oaEntryOld = validateOaEntryExists(oaEntryNew.getId());
         oaEntryNew.setEntryId(oaEntryOld.getEntryId())
                 .setProcInstId(oaEntryOld.getProcInstId());
 
@@ -385,7 +385,7 @@ public class OaEntryServiceImpl implements OaEntryService {
         Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
         // TODO DP 根据登录人查询出对应的员工信息
 
-        OaEntryDO oaEntryDO = oaEntryMapper.selectById(id);
+        OaEntryDO oaEntryDO = validateOaEntryExists(id);
         if (!DictDataConstants.OA_AUDIT_STATUS_RETURNED.equals(oaEntryDO.getAuditStatus())
                 && !DictDataConstants.OA_AUDIT_STATUS_RECALLED.equals(oaEntryDO.getAuditStatus())) {
             throw exception(ErrorCodeConstants.TASK_CLOSE_NOT_ALLOWED);
@@ -425,7 +425,7 @@ public class OaEntryServiceImpl implements OaEntryService {
         Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
         // TODO DP 根据登录人查询出对应的员工信息
 
-        OaEntryDO oaEntryDO = oaEntryMapper.selectById(id);
+        OaEntryDO oaEntryDO = validateOaEntryExists(id);
         OaEntryRespVO oaEntryRespVO = BeanUtils.toBean(oaEntryDO, OaEntryRespVO.class);
         if (oaEntryDO.getDeptId() != null) {
             DeptRespDTO dept = deptApi.getDept(oaEntryDO.getDeptId());
@@ -563,14 +563,18 @@ public class OaEntryServiceImpl implements OaEntryService {
         return getOaEntryPage(pageReqVO);
     }
 
-    private void validateOaEntryExists(Long id) {
+    private void validateOaEntryDelete(Long id) {
+        OaEntryDO oaEntryDO = validateOaEntryExists(id);
+        if (!DictDataConstants.OA_AUDIT_STATUS_STAGING.equals(oaEntryDO.getAuditStatus())) {
+            throw exception(ErrorCodeConstants.DELETE_FAIL_NOT_STAGING);
+        }
+    }
+    private OaEntryDO validateOaEntryExists(Long id) {
         OaEntryDO oaEntryDO = oaEntryMapper.selectById(id);
         if (oaEntryDO == null) {
             throw exception(OA_ENTRY_NOT_EXISTS);
         }
-        if (!DictDataConstants.OA_AUDIT_STATUS_STAGING.equals(oaEntryDO.getAuditStatus())) {
-            throw exception(ErrorCodeConstants.DELETE_FAIL_NOT_STAGING);
-        }
+        return oaEntryDO;
     }
 
     /**

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/leave/OaLeaveServiceImpl.java

@@ -162,7 +162,7 @@ public class OaLeaveServiceImpl implements OaLeaveService {
         if (oaLeave.getId() == null) {
             oaLeaveMapper.insert(oaLeave);
         } else {
-            OaLeaveDO oaLeaveDO = oaLeaveMapper.selectById(oaLeave.getId());
+            OaLeaveDO oaLeaveDO = validateOaLeaveExists(oaLeave.getId());
             if (StrUtil.isNotBlank(oaLeaveDO.getProcInstId())) {
                 throw exception(ErrorCodeConstants.PROCESS_INSTANCE_CREATE_FAIL_HAS_PROCESS);
             }
@@ -385,7 +385,7 @@ public class OaLeaveServiceImpl implements OaLeaveService {
         }
 
         OaLeaveDO oaLeaveNew = BeanUtils.toBean(reCommitReqVO, OaLeaveDO.class);
-        OaLeaveDO oaLeaveOld = oaLeaveMapper.selectById(oaLeaveNew.getId());
+        OaLeaveDO oaLeaveOld = validateOaLeaveExists(oaLeaveNew.getId());
         oaLeaveNew.setLeaveId(oaLeaveOld.getLeaveId())
                 .setProcInstId(oaLeaveOld.getProcInstId());
 
@@ -471,7 +471,7 @@ public class OaLeaveServiceImpl implements OaLeaveService {
     @Override
     public void deleteOaLeave(Long id) {
         // 校验存在
-        validateOaLeaveExists(id);
+        validateOaLeaveDelete(id);
         // 删除
         oaLeaveMapper.deleteById(id);
     }
@@ -482,7 +482,7 @@ public class OaLeaveServiceImpl implements OaLeaveService {
         Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
         // TODO DP 根据登录人查询出对应的员工信息
 
-        OaLeaveDO oaLeaveDO = oaLeaveMapper.selectById(id);
+        OaLeaveDO oaLeaveDO = validateOaLeaveExists(id);
         OaLeaveRespVO oaLeaveRespVO = BeanUtils.toBean(oaLeaveDO, OaLeaveRespVO.class);
         if (oaLeaveDO.getDeptId() != null) {
             DeptRespDTO dept = deptApi.getDept(oaLeaveDO.getDeptId());
@@ -620,14 +620,19 @@ public class OaLeaveServiceImpl implements OaLeaveService {
         return getOaLeavePage(pageReqVO);
     }
 
-    private void validateOaLeaveExists(Long id) {
+    private void validateOaLeaveDelete(Long id) {
+        OaLeaveDO oaLeaveDO = validateOaLeaveExists(id);
+        if (!DictDataConstants.OA_AUDIT_STATUS_STAGING.equals(oaLeaveDO.getAuditStatus())) {
+            throw exception(ErrorCodeConstants.DELETE_FAIL_NOT_STAGING);
+        }
+    }
+
+    private OaLeaveDO validateOaLeaveExists(Long id) {
         OaLeaveDO oaLeaveDO = oaLeaveMapper.selectById(id);
         if (oaLeaveDO == null) {
             throw exception(OA_LEAVE_NOT_EXISTS);
         }
-        if (!DictDataConstants.OA_AUDIT_STATUS_STAGING.equals(oaLeaveDO.getAuditStatus())) {
-            throw exception(ErrorCodeConstants.DELETE_FAIL_NOT_STAGING);
-        }
+        return oaLeaveDO;
     }
 
     /**

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/renew/OaRenewServiceImpl.java

@@ -165,7 +165,7 @@ public class OaRenewServiceImpl implements OaRenewService {
         if (oaRenew.getId() == null) {
             oaRenewMapper.insert(oaRenew);
         } else {
-            OaRenewDO oaRenewDO = oaRenewMapper.selectById(oaRenew.getId());
+            OaRenewDO oaRenewDO = validateOaRenewExists(oaRenew.getId());
             if (StrUtil.isNotBlank(oaRenewDO.getProcInstId())) {
                 throw exception(ErrorCodeConstants.PROCESS_INSTANCE_CREATE_FAIL_HAS_PROCESS);
             }
@@ -388,7 +388,7 @@ public class OaRenewServiceImpl implements OaRenewService {
         }
 
         OaRenewDO oaRenewNew = BeanUtils.toBean(reCommitReqVO, OaRenewDO.class);
-        OaRenewDO oaRenewOld = oaRenewMapper.selectById(oaRenewNew.getId());
+        OaRenewDO oaRenewOld = validateOaRenewExists(oaRenewNew.getId());
         oaRenewNew.setRenewId(oaRenewOld.getRenewId())
                 .setProcInstId(oaRenewOld.getProcInstId());
 
@@ -447,7 +447,7 @@ public class OaRenewServiceImpl implements OaRenewService {
         Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
         // TODO DP 根据登录人查询出对应的员工信息
 
-        OaRenewDO oaRenewDO = oaRenewMapper.selectById(id);
+        OaRenewDO oaRenewDO = validateOaRenewExists(id);
         if (!DictDataConstants.OA_AUDIT_STATUS_RETURNED.equals(oaRenewDO.getAuditStatus())
                 && !DictDataConstants.OA_AUDIT_STATUS_RECALLED.equals(oaRenewDO.getAuditStatus())) {
             throw exception(ErrorCodeConstants.TASK_CLOSE_NOT_ALLOWED);
@@ -476,7 +476,7 @@ public class OaRenewServiceImpl implements OaRenewService {
     @Override
     public void deleteOaRenew(Long id) {
         // 校验存在
-        validateOaRenewExists(id);
+        validateOaRenewDelete(id);
         // 删除
         oaRenewMapper.deleteById(id);
     }
@@ -487,7 +487,7 @@ public class OaRenewServiceImpl implements OaRenewService {
         Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
         // TODO DP 根据登录人查询出对应的员工信息
 
-        OaRenewDO oaRenewDO = oaRenewMapper.selectById(id);
+        OaRenewDO oaRenewDO = validateOaRenewExists(id);
         OaRenewRespVO oaRenewRespVO = BeanUtils.toBean(oaRenewDO, OaRenewRespVO.class);
         if (oaRenewDO.getDeptId() != null) {
             DeptRespDTO dept = deptApi.getDept(oaRenewDO.getDeptId());
@@ -625,14 +625,19 @@ public class OaRenewServiceImpl implements OaRenewService {
         return getOaRenewPage(pageReqVO);
     }
 
-    private void validateOaRenewExists(Long id) {
+    private void validateOaRenewDelete(Long id) {
+        OaRenewDO oaRenewDO = validateOaRenewExists(id);
+        if (!DictDataConstants.OA_AUDIT_STATUS_STAGING.equals(oaRenewDO.getAuditStatus())) {
+            throw exception(ErrorCodeConstants.DELETE_FAIL_NOT_STAGING);
+        }
+    }
+
+    private OaRenewDO validateOaRenewExists(Long id) {
         OaRenewDO oaRenewDO = oaRenewMapper.selectById(id);
         if (oaRenewDO == null) {
             throw exception(OA_RENEW_NOT_EXISTS);
         }
-        if (!DictDataConstants.OA_AUDIT_STATUS_STAGING.equals(oaRenewDO.getAuditStatus())) {
-            throw exception(ErrorCodeConstants.DELETE_FAIL_NOT_STAGING);
-        }
+        return oaRenewDO;
     }
 
     /**

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/turnover/OaTurnoverServiceImpl.java

@@ -164,7 +164,7 @@ public class OaTurnoverServiceImpl implements OaTurnoverService {
         if (oaTurnover.getId() == null) {
             oaTurnoverMapper.insert(oaTurnover);
         } else {
-            OaTurnoverDO oaTurnoverDO = oaTurnoverMapper.selectById(oaTurnover.getId());
+            OaTurnoverDO oaTurnoverDO = validateOaTurnoverExists(oaTurnover.getId());
             if (StrUtil.isNotBlank(oaTurnoverDO.getProcInstId())) {
                 throw exception(ErrorCodeConstants.PROCESS_INSTANCE_CREATE_FAIL_HAS_PROCESS);
             }
@@ -387,7 +387,7 @@ public class OaTurnoverServiceImpl implements OaTurnoverService {
         }
 
         OaTurnoverDO oaTurnoverNew = BeanUtils.toBean(reCommitReqVO, OaTurnoverDO.class);
-        OaTurnoverDO oaTurnoverOld = oaTurnoverMapper.selectById(oaTurnoverNew.getId());
+        OaTurnoverDO oaTurnoverOld = validateOaTurnoverExists(oaTurnoverNew.getId());
         oaTurnoverNew.setTurnoverId(oaTurnoverOld.getTurnoverId())
                 .setProcInstId(oaTurnoverOld.getProcInstId());
 
@@ -445,7 +445,7 @@ public class OaTurnoverServiceImpl implements OaTurnoverService {
         Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
         // TODO DP 根据登录人查询出对应的员工信息
 
-        OaTurnoverDO oaTurnoverDO = oaTurnoverMapper.selectById(id);
+        OaTurnoverDO oaTurnoverDO = validateOaTurnoverExists(id);
         if (!DictDataConstants.OA_AUDIT_STATUS_RETURNED.equals(oaTurnoverDO.getAuditStatus())
                 && !DictDataConstants.OA_AUDIT_STATUS_RECALLED.equals(oaTurnoverDO.getAuditStatus())) {
             throw exception(ErrorCodeConstants.TASK_CLOSE_NOT_ALLOWED);
@@ -474,7 +474,7 @@ public class OaTurnoverServiceImpl implements OaTurnoverService {
     @Override
     public void deleteOaTurnover(Long id) {
         // 校验存在
-        validateOaTurnoverExists(id);
+        validateOaTurnoverDelete(id);
         // 删除
         oaTurnoverMapper.deleteById(id);
     }
@@ -623,14 +623,19 @@ public class OaTurnoverServiceImpl implements OaTurnoverService {
         return getOaTurnoverPage(pageReqVO);
     }
 
-    private void validateOaTurnoverExists(Long id) {
+    private void validateOaTurnoverDelete(Long id) {
+        OaTurnoverDO oaTurnoverDO = validateOaTurnoverExists(id);
+        if (!DictDataConstants.OA_AUDIT_STATUS_STAGING.equals(oaTurnoverDO.getAuditStatus())) {
+            throw exception(ErrorCodeConstants.DELETE_FAIL_NOT_STAGING);
+        }
+    }
+
+    private OaTurnoverDO validateOaTurnoverExists(Long id) {
         OaTurnoverDO oaTurnoverDO = oaTurnoverMapper.selectById(id);
         if (oaTurnoverDO == null) {
             throw exception(OA_TURNOVER_NOT_EXISTS);
         }
-        if (!DictDataConstants.OA_AUDIT_STATUS_STAGING.equals(oaTurnoverDO.getAuditStatus())) {
-            throw exception(ErrorCodeConstants.DELETE_FAIL_NOT_STAGING);
-        }
+        return oaTurnoverDO;
     }
 
     /**

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/universal/OaUniversalServiceImpl.java

@@ -149,7 +149,7 @@ public class OaUniversalServiceImpl implements OaUniversalService {
         if (oaUniversal.getId() == null) {
             oaUniversalMapper.insert(oaUniversal);
         } else {
-            OaUniversalDO oaUniversalDO = oaUniversalMapper.selectById(oaUniversal.getId());
+            OaUniversalDO oaUniversalDO = validateOaUniversalExists(oaUniversal.getId());
             if (StrUtil.isNotBlank(oaUniversalDO.getProcInstId())) {
                 throw exception(ErrorCodeConstants.PROCESS_INSTANCE_CREATE_FAIL_HAS_PROCESS);
             }
@@ -349,7 +349,7 @@ public class OaUniversalServiceImpl implements OaUniversalService {
         // TODO DP 根据登录人查询出对应的员工信息
 
         OaUniversalDO oaUniversalNew = BeanUtils.toBean(reCommitReqVO, OaUniversalDO.class);
-        OaUniversalDO oaUniversalOld = oaUniversalMapper.selectById(oaUniversalNew.getId());
+        OaUniversalDO oaUniversalOld = validateOaUniversalExists(oaUniversalNew.getId());
         oaUniversalNew.setUniversalId(oaUniversalOld.getUniversalId())
                 .setProcInstId(oaUniversalOld.getProcInstId());
 
@@ -394,7 +394,7 @@ public class OaUniversalServiceImpl implements OaUniversalService {
         Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
         // TODO DP 根据登录人查询出对应的员工信息
 
-        OaUniversalDO oaUniversalDO = oaUniversalMapper.selectById(id);
+        OaUniversalDO oaUniversalDO = validateOaUniversalExists(id);
         if (!DictDataConstants.OA_AUDIT_STATUS_RETURNED.equals(oaUniversalDO.getAuditStatus())
             && !DictDataConstants.OA_AUDIT_STATUS_RECALLED.equals(oaUniversalDO.getAuditStatus())) {
             throw exception(ErrorCodeConstants.TASK_CLOSE_NOT_ALLOWED);
@@ -423,7 +423,7 @@ public class OaUniversalServiceImpl implements OaUniversalService {
     @Override
     public void deleteOaUniversal(Long id) {
         // 校验存在
-        validateOaUniversalExists(id);
+        validateOaUniversalDelete(id);
         // 删除
         oaUniversalMapper.deleteById(id);
     }
@@ -434,7 +434,7 @@ public class OaUniversalServiceImpl implements OaUniversalService {
         Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
         // TODO DP 根据登录人查询出对应的员工信息
 
-        OaUniversalDO oaUniversalDO = oaUniversalMapper.selectById(id);
+        OaUniversalDO oaUniversalDO = validateOaUniversalExists(id);
         OaUniversalRespVO oaUniversalRespVO = BeanUtils.toBean(oaUniversalDO, OaUniversalRespVO.class);
         if (oaUniversalDO.getDeptId() != null) {
             DeptRespDTO dept = deptApi.getDept(oaUniversalDO.getDeptId());
@@ -572,14 +572,19 @@ public class OaUniversalServiceImpl implements OaUniversalService {
         return getOaUniversalPage(pageReqVO);
     }
 
-    private void validateOaUniversalExists(Long id) {
+    private void validateOaUniversalDelete(Long id) {
+        OaUniversalDO oaUniversalDO = validateOaUniversalExists(id);
+        if (!DictDataConstants.OA_AUDIT_STATUS_STAGING.equals(oaUniversalDO.getAuditStatus())) {
+            throw exception(ErrorCodeConstants.DELETE_FAIL_NOT_STAGING);
+        }
+    }
+
+    private OaUniversalDO validateOaUniversalExists(Long id) {
         OaUniversalDO oaUniversalDO = oaUniversalMapper.selectById(id);
         if (oaUniversalDO == null) {
             throw exception(OA_UNIVERSAL_NOT_EXISTS);
         }
-        if (!DictDataConstants.OA_AUDIT_STATUS_STAGING.equals(oaUniversalDO.getAuditStatus())) {
-            throw exception(ErrorCodeConstants.DELETE_FAIL_NOT_STAGING);
-        }
+        return oaUniversalDO;
     }
 
     /**