资金预算3

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/FormPeriodController.java

@@ -110,7 +110,7 @@ public class FormPeriodController extends BladeController {
 
 	@GetMapping("/deleteById")
 	@ApiOperationSupport(order = 6)
-	@ApiOperation(value = "删除资金预算计划", notes = "传入 资金预算期id")
+	@ApiOperation(value = "删除资金预算期", notes = "传入 资金预算期id")
 	public R deleteById(Long formPeriodId) {
 		formPeriodService.deleteById(formPeriodId);
 		return R.success("删除成功");

blade-service/blade-meter/src/main/java/org/springblade/meter/service/impl/FormPeriodServiceImpl.java

@@ -91,11 +91,13 @@ public class FormPeriodServiceImpl extends BaseServiceImpl<FormPeriodMapper, For
 
     @Override
     public void deleteById(Long formPeriodId) {
-        //校验当前资金预算期是否被引用
-        Integer status = baseMapper.checkCiteStatusById(formPeriodId);
-        if (status == 1){
-            throw new ServiceException("删除失败：当前资金预算期已经被引用");
+        if (formPeriodId != null) {
+            //校验当前资金预算期是否被引用
+            Integer status = baseMapper.checkCiteStatusById(formPeriodId);
+            if (status == 1) {
+                throw new ServiceException("删除失败：当前资金预算期已经被引用");
+            }
+            baseMapper.removeById(formPeriodId);
         }
-        baseMapper.removeById(formPeriodId);
     }
 }