From 662d38da560fd1cfcd7c6b0c269061bcb0e3e0de Mon Sep 17 00:00:00 2001
From: JiaLeiTao <jltdev@163.com>
Date: Thu, 7 Apr 2022 11:41:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BC=9A=E5=91=98=E5=85=A5?=
 =?UTF-8?q?=E9=A9=BB=E7=9A=84=E5=88=97=E8=A1=A8=E5=88=B7=E6=96=B0=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=EF=BC=8C=E5=90=88=E7=BA=A6=E7=B1=BB=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E8=8F=9C=E5=9C=B0=E5=AF=B9=E8=B1=A1=E7=B1=BB=E5=9E=8B=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jlt/csa/domain/FarmerContract.java     |  6 +++---
 ruoyi-ui/src/views/csa/contract/enter.vue           | 13 +++++++++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/private-farm/src/main/java/com/jlt/csa/domain/FarmerContract.java b/private-farm/src/main/java/com/jlt/csa/domain/FarmerContract.java
index 2993fc35b..e972b9e47 100644
--- a/private-farm/src/main/java/com/jlt/csa/domain/FarmerContract.java
+++ b/private-farm/src/main/java/com/jlt/csa/domain/FarmerContract.java
@@ -38,7 +38,7 @@ public class FarmerContract extends BaseEntity
     private Long gardenId;
 
     /** 菜地 */
-    private Farmer garden;
+    private Garden garden;
 
     /** 签约人 */
     @Excel(name = "签约人")
@@ -147,11 +147,11 @@ public class FarmerContract extends BaseEntity
         this.gardenId = gardenId;
     }
 
-    public Farmer getGarden() {
+    public Garden getGarden() {
         return garden;
     }
 
-    public void setGarden(Farmer garden) {
+    public void setGarden(Garden garden) {
         this.garden = garden;
     }
 
diff --git a/ruoyi-ui/src/views/csa/contract/enter.vue b/ruoyi-ui/src/views/csa/contract/enter.vue
index 6b0b8f853..3684add62 100644
--- a/ruoyi-ui/src/views/csa/contract/enter.vue
+++ b/ruoyi-ui/src/views/csa/contract/enter.vue
@@ -63,9 +63,18 @@
       <el-table-column label="菜地编号" align="center" prop="garden.Name">
         <template slot-scope="scope">
           <el-tag
-            :key="scope.row.contractId"
+            :key="'c' + scope.row.contractId"
             :type="scope.row.status == '1' ? 'success' : 'warning'" effect="plain">
-            {{ scope.row.garden ? scope.row.garden.Name : '未认领' }}
+            {{ scope.row.garden ? scope.row.garden.code : '未认领' }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="菜地名称" align="center" prop="garden.Name">
+        <template slot-scope="scope">
+          <el-tag
+            :key="'n' + scope.row.contractId"
+            :type="scope.row.status == '1' ? 'success' : 'warning'" effect="plain">
+            {{ scope.row.garden ? (scope.row.garden.name != '' ? scope.row.garden.name : '未命名' ) : '未认领' }}
           </el-tag>
         </template>
       </el-table-column>