From a3811f2c1f7bf720f923202d82bf31e03d82264d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 31 May 2022 09:02:02 +0800
Subject: [PATCH] 农产品结束修改

---
 src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java b/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
index 7d28661..5370e24 100644
--- a/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
+++ b/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
@@ -136,6 +136,7 @@
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入farmPlant")
+	@Transactional(rollbackFor = Exception.class)
 	public R update(@Valid @RequestBody FarmPlant farmPlant) {
 		boolean status = false;
 		//如果是结束
@@ -143,15 +144,16 @@
 			//更新
 			status = farmplantService.updateById(farmPlant);
 			//判断该地块是否还有种植的农产品
+			FarmPlant farmPlant2 = farmplantService.getById(farmPlant.getId());
 			FarmPlant farmPlant1 = new FarmPlant();
-			farmPlant1.setLandId(farmPlant.getLandId());
+			farmPlant1.setLandId(farmPlant2.getLandId());
 			farmPlant1.setStatus("1");
 			List<FarmPlant> list = farmplantService.list(new QueryWrapper<>(farmPlant1));
 			if (list.size()<1){
 				//更新该地块的耕种状态
 				Land land = new Land();
 				land.setType(1);
-				land.setId(Long.parseLong(farmPlant.getLandId()));
+				land.setId(Long.parseLong(farmPlant2.getLandId()));
 				landService.updateById(land);
 			}
 		}else {

--
Gitblit v1.9.3