From 2648880bec1583ce4fe1886de65300f0a22638d0 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 26 Sep 2022 17:09:31 +0800
Subject: [PATCH] 更改种类描述的判断方式、溯源时地图详情sql调整、农资出库时删除数据回滚修复、大屏接受数据增加展示判断
---
src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java | 4 ++--
1 files changed, 2 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 1dc44fa..3dd4c46 100644
--- a/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
+++ b/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
@@ -33,6 +33,7 @@
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.constant.RoleConstant;
import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
import org.springblade.modules.farm.entity.FarmingRecord;
import org.springblade.modules.farm.service.FarmingRecordService;
import org.springblade.modules.farmplant.entity.FarmPlant;
@@ -226,9 +227,8 @@
}
record.setLandId(farmPlant.getLandId());
record.setOperator(farmPlant.getCreateUser());
- if (farmPlant.getVarieties().equals("")){
+ if (StringUtil.isBlank(farmPlant.getVarieties())){
record.setContent("品种: " + strain.getStrainName());
-
}else {
record.setContent("品种: " + strain.getStrainName()+"-"+farmPlant.getVarieties());
}
--
Gitblit v1.9.3