diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java index 492ed33a..b50c8a73 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java @@ -60,6 +60,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -196,6 +197,11 @@ public class CraftAbilityController extends BladeController { if(craftAbilityService.count(queryWrapper) > 0){ return R.fail("编码已存在"); } + + if(null == craftAbility.getLocalArea()){ + craftAbility.setLocalArea(new BigDecimal("-1")); + } + return R.status(craftAbilityService.updateById(craftAbility)); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionItemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionItemController.java index 95d64c95..a982711a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionItemController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionItemController.java @@ -146,6 +146,9 @@ public class InspectionItemController extends BladeController { @ApiLog("修改检验项目") @Operation(summary = "修改一条", description = "传入InspectionItem Obj") public R update(@Valid @RequestBody InspectionItem updateOne) { + if(null == updateOne.getStandardWorkMinute()){ + updateOne.setStandardWorkMinute(-1D); + } return R.status(service.updateById(updateOne)); }