From 36fd62cfb9c484ab9f2a5ac205d129c37d4fbb12 Mon Sep 17 00:00:00 2001
From: xiebin <123456>
Date: Tue, 30 Aug 2022 15:20:38 +0800
Subject: [PATCH] 优化登录相关

---
 src/main/java/org/springblade/modules/lang/controller/LandController.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springblade/modules/lang/controller/LandController.java b/src/main/java/org/springblade/modules/lang/controller/LandController.java
index c78e810..f140855 100644
--- a/src/main/java/org/springblade/modules/lang/controller/LandController.java
+++ b/src/main/java/org/springblade/modules/lang/controller/LandController.java
@@ -113,7 +113,7 @@
 	 */
 	@GetMapping("/selcetByStrainId")
 	public R selcetByStrainId(String strainId,String farmId) {
-		List<Land> list = landService.selectByStrainId(strainId,farmId);
+		List<LandVO> list = landService.selectByStrainId(strainId,farmId);
 		return R.data(list);
 	}
 
@@ -365,7 +365,7 @@
 			if (unit.equals("0")) {
 				num += area1;
 			}
-			if (unit.equals("1")) {
+			else if (unit.equals("1")) {
 				double v = area1 * 0.1;
 				num += v;
 			} else {
@@ -385,10 +385,10 @@
 			if (unit.equals("0")) {
 				snum += area1;
 			}
-			if (unit.equals("1")) {
+			else if (unit.equals("1")) {
 				double v = area1 * 0.1;
 				snum += v;
-			} else {
+			} else{
 				double v = area1 * 0.0015;
 				snum += v;
 			}

--
Gitblit v1.9.3