1、完成认领菜地和更新认领菜地的后端逻辑，修正之前的错误。

2、优化了前端复选框的逻辑。

下一步：确认生效的前后端逻辑。

private-farm/src/main/java/com/jlt/csa/service/impl/FarmerContractServiceImpl.java

@@ -13,6 +13,8 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.DictUtils;
 import com.ruoyi.common.utils.ExceptionUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.jlt.csa.mapper.FarmerContractMapper;
@@ -31,6 +33,8 @@ import static com.ruoyi.common.utils.SecurityUtils.getUsername;
 @Service
 public class FarmerContractServiceImpl implements IFarmerContractService 
 {
+    private static final Logger log = LoggerFactory.getLogger(FarmerContractServiceImpl.class);
+
     private FarmerContractMapper farmerContractMapper;
     private IFarmerService farmerService;
     private IGardenService gardenService;
@@ -83,43 +87,61 @@ public class FarmerContractServiceImpl implements IFarmerContractService
             throw new RuntimeException("该合约对应的地主信息不存在，无法认领！");
         }
 
-        // 已审状态的合约
+        Garden garden = gardenService.selectGardenById(claim.getGardenId());
-        if (contract.getStatus().equals(valAudited)) {
-            Garden garden = gardenService.selectGardenById(claim.getGardenId());
 
-            if (!garden.getIsSelled().equals("N")) {
+        if (!garden.getIsSelled().equals("N")) {
-                // 菜地为售出状态
+            // 菜地为售出状态
-                throw new RuntimeException("该菜地已被认领，无法再次认领！");
+            throw new RuntimeException("该菜地已被认领，无法再次认领！");
-            } else {
+        } else {
-                if (garden.getFarmerId() != null) {
+            if (garden.getFarmerId() != null && garden.getFarmerId() != farmer.getFarmerId()) {
-                    // 菜地已经有地主信息
+                // 菜地已经有地主信息
-                    throw new RuntimeException("该菜地已被他人选定，无法认领！");
+                throw new RuntimeException("该菜地已被他人选定，无法认领！");
-                }
             }
-
-            // 准备更新的字段
-            contract = new FarmerContract();
-            contract.setContractId(claim.getContractId());
-            contract.setGardenId(claim.getGardenId());
-            contract.setStatus(valClaimed);
-
-            garden = new Garden();
-            garden.setGardenId(claim.getGardenId());
-            garden.setFarmerId(farmer.getFarmerId());
-
-            farmer = new Farmer();
-            farmer.setFarmerId(garden.getFarmerId());
-            farmer.setName(claim.getFarmerName());
-            farmer.setMobileNumber(claim.getMobileNumber());
-
-            this.updateFarmerContract(contract);
-            gardenService.updateGarden(garden);
-            farmerService.updateFarmer(farmer);
         }
 
-        // 更改已认领但未生效的合约
+        /** 已经绑定过菜地，先取消绑定 */
+        if (contract.getStatus().equals(valClaimed)) {
+            /** 只有选定菜地发生更改的时候才进行取消操作 */
+            Garden claimedGarden = gardenService.selectGardenById(contract.getGardenId());
+            if (claimedGarden.getGardenId().longValue() != claim.getGardenId()) {
+                if (!claimedGarden.getIsSelled().equals("N")) {
+                    // 菜地为售出状态，不能取消
+                    throw new RuntimeException("现合约原有菜地的状态不允许解绑！");
+                }
 
-        return 1;
+                // 准备更新菜地字段，取消地主关联和菜地名称
+                claimedGarden = new Garden();
+                claimedGarden.setGardenId(contract.getGardenId());
+                claimedGarden.setFarmerId(0L);
+                claimedGarden.setName("");
+
+                gardenService.updateGarden(claimedGarden);
+            }
+        }
+
+        /** 将合约、菜地、地主信息相关联 */
+        // 准备更新的字段
+        String status = contract.getStatus().equals(valAudited) ? valClaimed : null;
+        contract = new FarmerContract();
+        contract.setContractId(claim.getContractId());
+        contract.setGardenId(claim.getGardenId());
+        contract.setStatus(status);
+
+        garden = new Garden();
+        garden.setGardenId(claim.getGardenId());
+        garden.setFarmerId(farmer.getFarmerId());
+        garden.setName(claim.getGardenName());
+
+        farmer = new Farmer();
+        farmer.setFarmerId(garden.getFarmerId());
+        farmer.setName(claim.getFarmerName());
+        farmer.setMobileNumber(claim.getMobileNumber());
+
+        this.updateFarmerContract(contract);
+        gardenService.updateGarden(garden);
+        farmerService.updateFarmer(farmer);
+
+        return 4;
     }
 
     /**

private-farm/src/main/resources/mapper/csa/FarmerMapper.xml

@@ -8,7 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="farmerId"    column="farmer_id"    />
         <result property="name"    column="name"    />
         <result property="gender"    column="gender"    />
-        <result property="mobileNumber"    column="mobile_umber"    />
+        <result property="mobileNumber"    column="mobile_number"    />
         <result property="coins"    column="coins"    />
         <result property="balance"    column="balance"    />
         <result property="weight"    column="weight"    />

private-farm/src/main/resources/mapper/csa/GardenMapper.xml

@@ -110,9 +110,10 @@
         <trim prefix="SET" suffixOverrides=",">
             <if test="zoneId != null">zone_id = #{zoneId},</if>
             <if test="code != null and code != ''">code = #{code},</if>
-            <if test="name != null and name != ''">name = #{name},</if>
+            <if test="name != null">name = #{name},</if>
             <if test="m2 != null">m2 = #{m2},</if>
-            <if test="farmerId != null">farmer_id = #{farmerId},</if>
+            <if test="farmerId != null and farmerId > 0">farmer_id = #{farmerId},</if>
+            <if test="farmerId == 0">farmer_id = null,</if>
             <if test="managerId != null">manager_id = #{managerId},</if>
             <if test="workerId != null">worker_id = #{workerId},</if>
             <if test="contacterId != null">contacter_id = #{contacterId},</if>

ruoyi-ui/src/views/csa/contract/enter.vue

@@ -34,21 +34,25 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-          type="danger"
+          type="success"
-          plain
           icon="el-icon-lock"
           size="mini"
           :disabled="single"
-          @click="handleAudit"
+          @click="handleConfirmClaim"
           v-hasPermi="['csa:contract:edit']"
-        >锁定
+        >确认生效
         </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="contractList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column type="selection" width="55" align="center" :selectable="rowCanSelect" />
+<!--      <el-table-column type="selection" width="55" align="center">-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-checkbox :disabled="scope.row.status != '1'" />-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="签约人" align="center" prop="contractor"/>
       <el-table-column label="会员姓名" align="center" prop="farmer.name">
         <template slot-scope="scope">
@@ -108,13 +112,13 @@
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
-            :disabled="(scope.row.status != '2' && scope.row.status == '1')"
+            :disabled="(scope.row.status != '2' && scope.row.status != '1')"
             size="mini "
             type="text"
             icon="el-icon-thumb"
             @click="handleUpdateFarmer(scope.row)"
             v-hasPermi="['csa:contract:edit']"
-          >认领菜地
+          >会员绑定
           </el-button>
         </template>
       </el-table-column>
@@ -144,15 +148,16 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="菜地编号" prop="garden.gardenId">
+            <el-form-item label="菜地编号" prop="garden.code">
-              <el-select v-model="form.garden.gardenId" placeholder="请选择菜地编号"
+              <el-select v-model="form.garden.code" value-key="code" @change="onGardenSelect" placeholder="请选择菜地编号"
                          :loading="isQuery" loading-text="正在查找可用菜地"
                          filterable remote :remote-method="remoteQueryGarden">
                 <el-option
                   v-for="garden in this.canSellGardens"
                   :key="garden.gardenId"
                   :label="garden.code"
-                  :value="garden.gardenId"
+                  :value="garden"
+                  :disabled="garden.farmerId != null && garden.farmerId != form.farmerId"
                 />
               </el-select>
             </el-form-item>
@@ -230,7 +235,7 @@
           ],
           garden: {
               code: [
-                { required: true, message: '菜地编码不能为空', trigger: 'blur' }
+                { required: true, message: '菜地编号不能为空', trigger: 'blur' }
               ],
               name: [
                 { required: true, message: '菜地名称不能为空', trigger: 'blur' }
@@ -241,6 +246,7 @@
     },
     created() {
       this.getList()
+      this.remoteQueryGarden('')
     },
     methods: {
       /** 查询会员签约列表 */
@@ -282,6 +288,9 @@
         this.resetForm('queryForm')
         this.handleQuery()
       },
+      rowCanSelect(row) {
+        return row.status == '1'
+      },
       // 多选框选中数据
       handleSelectionChange(selection) {
         this.curRowData = (selection.length == 1) ? selection[0] : null;
@@ -289,6 +298,10 @@
         this.single = selection.length !== 1
         this.multiple = !selection.length
       },
+      onGardenSelect(val) {
+        this.form.garden.gardenId = val.gardenId
+        // console.log(val)
+      },
       /** 认领菜地对话框弹出操作 */
       handleUpdateFarmer(row) {
         this.reset()
@@ -297,16 +310,12 @@
           this.form = response.data
           this.form.contractId = row.contractId
           this.open = true
-          this.title = '认领菜地'
+          this.title = '会员绑定'
         })
       },
-      /** 审核按钮操作 */
+      /** 确认生效按钮操作 */
-      handleAudit(row) {
+      handleConfirmClaim(row) {
-        if (this.curRowData.status != '3') {
+        return;
-          this.$modal.alertWarning("只有待定状态的合约才可以审核！");
-          return;
-        }
-
         this.$modal.confirm('是否要确定审核此合约', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -339,7 +348,7 @@
             claimFarmer(claim).then(response => {
               this.$modal.msgSuccess('修改成功')
               this.open = false
-              this.getList()
+              this.getList();
             })
           }
         })

ruoyi-ui/src/views/csa/contract/index.vue

@@ -106,7 +106,7 @@
     </el-row>
 
     <el-table v-loading="loading" :data="contractList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column type="selection" width="55" align="center" :selectable="rowCanSelect" />
       <el-table-column label="签约人" align="center" prop="contractor"/>
       <el-table-column label="合约状态" align="center" prop="status">
         <template slot-scope="scope">
@@ -396,6 +396,9 @@
         this.resetForm('queryForm')
         this.handleQuery()
       },
+      rowCanSelect(row) {
+        return row.status == '3'
+      },
       // 多选框选中数据
       handleSelectionChange(selection) {
         this.curRowData = (selection.length == 1) ? selection[0] : null;
@@ -421,11 +424,6 @@
       },
       /** 审核按钮操作 */
       handleAudit(row) {
-        if (this.curRowData.status != '3') {
-          this.$modal.alertWarning("只有待定状态的合约才可以审核！");
-          return;
-        }
-
         this.$modal.confirm('是否要确定审核此合约', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',

sql/csa.sql

@@ -11,7 +11,7 @@
  Target Server Version : 50731
  File Encoding         : 65001
 
- Date: 06/04/2022 23:53:50
+ Date: 07/04/2022 23:14:58
 */
 
 SET NAMES utf8mb4;
@@ -292,8 +292,8 @@ CREATE TABLE `csa_farmer`  (
 -- ----------------------------
 -- Records of csa_farmer
 -- ----------------------------
-INSERT INTO `csa_farmer` VALUES (3, '范诚诚', NULL, '13672226668', 25000, 300.0000, 20.0000, 1, '2021-05-01', NULL, 'N', '0', '0', '', '2022-04-05 13:06:27', '', '2022-04-05 13:18:27', NULL);
+INSERT INTO `csa_farmer` VALUES (3, '范诚诚', NULL, '13672226668', 25000, 300.0000, 20.0000, 1, '2021-05-01', NULL, 'N', '0', '0', '', '2022-04-05 13:06:27', '', '2022-04-07 22:21:18', NULL);
-INSERT INTO `csa_farmer` VALUES (5, '程开州', NULL, '13588886666', 15000, 0.0000, 60.0000, 2, '2021-04-05', NULL, 'N', '0', '0', '', '2022-04-05 18:57:35', '', '2022-04-06 23:39:10', NULL);
+INSERT INTO `csa_farmer` VALUES (5, '程开州', NULL, '13588886666', 15000, 0.0000, 60.0000, 2, '2021-04-05', NULL, 'N', '0', '0', '', '2022-04-05 18:57:35', '', '2022-04-07 22:48:14', NULL);
 
 -- ----------------------------
 -- Table structure for csa_farmer_contract
@@ -327,8 +327,8 @@ CREATE TABLE `csa_farmer_contract`  (
 -- Records of csa_farmer_contract
 -- ----------------------------
 INSERT INTO `csa_farmer_contract` VALUES (101, NULL, NULL, '王丽美', 10000, 0.0000, 0.0000, 0, 'QY', 'No.008', '2022-03-01', '2022-05-01', 62, '3', '0', 'admin', '2022-04-01 22:29:42', 'admin', '2022-04-04 14:54:20', NULL);
-INSERT INTO `csa_farmer_contract` VALUES (102, 5, 6, '程开州', 15000, 0.0000, 60.0000, 2, 'QY', 'No.002', '2021-04-05', '2022-04-04', 365, '1', '0', 'admin', '2022-04-04 00:42:06', 'admin', '2022-04-06 23:39:10', '好朋友介绍，非常喜欢我们的农场，订嘱每次到期前都要提醒约续。');
+INSERT INTO `csa_farmer_contract` VALUES (102, 5, 8, '程开州', 15000, 0.0000, 60.0000, 2, 'QY', 'No.002', '2021-04-05', '2022-04-04', 365, '1', '0', 'admin', '2022-04-04 00:42:06', 'admin', '2022-04-07 22:48:14', '好朋友介绍，非常喜欢我们的农场，订嘱每次到期前都要提醒约续。');
-INSERT INTO `csa_farmer_contract` VALUES (103, 3, NULL, '范诚诚', 5000, 300.0000, 20.0000, 1, 'QY', 'No.003', '2021-05-01', '2022-04-30', 365, '2', '0', 'admin', '2022-04-04 14:30:01', 'admin', '2022-04-05 13:18:27', NULL);
+INSERT INTO `csa_farmer_contract` VALUES (103, 3, 10, '范诚诚', 5000, 300.0000, 20.0000, 1, 'QY', 'No.003', '2021-05-01', '2022-04-30', 365, '1', '0', 'admin', '2022-04-04 14:30:01', 'admin', '2022-04-07 22:21:18', NULL);
 
 -- ----------------------------
 -- Table structure for csa_garden
@@ -366,11 +366,11 @@ INSERT INTO `csa_garden` VALUES (2, 1, '8002', '香草居', 30, NULL, NULL, NULL
 INSERT INTO `csa_garden` VALUES (3, 1, '8003', '', 30, NULL, NULL, NULL, NULL, 'N', 'N', 'Y', '0', '0', '101', '2022-03-07 13:15:43', 'admin', '2022-04-05 22:42:09', NULL);
 INSERT INTO `csa_garden` VALUES (4, 1, '8004', '', 30, NULL, NULL, NULL, NULL, 'N', 'N', 'Y', '0', '0', '101', '2022-03-07 13:20:38', 'admin', '2022-04-05 22:42:09', '');
 INSERT INTO `csa_garden` VALUES (5, 1, '8005', '', 30, NULL, NULL, NULL, NULL, 'N', 'N', 'Y', '0', '0', '101', '2022-03-29 21:05:48', 'admin', '2022-04-05 22:42:09', NULL);
-INSERT INTO `csa_garden` VALUES (6, 1, '8006', '', 30, 5, NULL, NULL, NULL, 'N', 'N', 'Y', '0', '0', '101', '2022-03-29 22:07:11', 'admin', '2022-04-05 22:42:09', NULL);
+INSERT INTO `csa_garden` VALUES (6, 1, '8006', '', 30, NULL, NULL, NULL, NULL, 'N', 'N', 'Y', '0', '0', '101', '2022-03-29 22:07:11', 'admin', '2022-04-05 22:42:09', NULL);
 INSERT INTO `csa_garden` VALUES (7, 1, '8007', '', 30, NULL, NULL, NULL, NULL, 'N', 'N', 'Y', '0', '0', '101', '2022-03-29 22:07:56', 'admin', '2022-04-05 22:42:09', NULL);
-INSERT INTO `csa_garden` VALUES (8, 1, '8008', '', 30, NULL, NULL, NULL, NULL, 'N', 'N', 'Y', '0', '0', '101', '2022-03-29 22:13:41', 'admin', '2022-04-05 22:42:09', NULL);
+INSERT INTO `csa_garden` VALUES (8, 1, '8008', '梦幻乐园', 30, 5, NULL, NULL, NULL, 'N', 'N', 'Y', '0', '0', '101', '2022-03-29 22:13:41', 'admin', '2022-04-05 22:42:09', NULL);
 INSERT INTO `csa_garden` VALUES (9, 1, '8009', '', 30, NULL, NULL, NULL, NULL, 'N', 'N', 'Y', '0', '0', '101', '2022-03-29 22:15:24', 'admin', '2022-04-05 22:42:09', NULL);
-INSERT INTO `csa_garden` VALUES (10, 1, '8010', '', 30, NULL, NULL, NULL, NULL, 'N', 'N', 'Y', '0', '0', '101', '2022-03-30 22:06:38', 'admin', '2022-04-05 22:42:09', NULL);
+INSERT INTO `csa_garden` VALUES (10, 1, '8010', '绝情谷', 30, 3, NULL, NULL, NULL, 'N', 'N', 'Y', '0', '0', '101', '2022-03-30 22:06:38', 'admin', '2022-04-05 22:42:09', NULL);
 INSERT INTO `csa_garden` VALUES (11, 1, '8011', '', 30, NULL, NULL, NULL, NULL, 'N', 'N', 'Y', '0', '0', '101', '2022-03-30 22:06:38', 'admin', '2022-04-05 22:42:15', NULL);
 INSERT INTO `csa_garden` VALUES (12, 1, '8012', '', 30, NULL, NULL, NULL, NULL, 'N', 'N', 'Y', '0', '0', '101', '2022-03-30 22:06:38', 'admin', '2022-04-05 22:42:15', NULL);
 
@@ -1341,7 +1341,7 @@ CREATE TABLE `sys_logininfor`  (
   `msg` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '提示消息',
   `login_time` datetime NULL DEFAULT NULL COMMENT '访问时间',
   PRIMARY KEY (`info_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 217 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统访问记录' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 220 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统访问记录' ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Records of sys_logininfor
@@ -1463,6 +1463,9 @@ INSERT INTO `sys_logininfor` VALUES (213, 'admin', '127.0.0.1', '内网IP', 'Chr
 INSERT INTO `sys_logininfor` VALUES (214, 'admin', '127.0.0.1', '内网IP', 'Firefox 9', 'Windows 10', '0', '登录成功', '2022-04-06 20:25:27');
 INSERT INTO `sys_logininfor` VALUES (215, 'admin', '127.0.0.1', '内网IP', 'Chrome 9', 'Windows 10', '0', '登录成功', '2022-04-06 20:46:38');
 INSERT INTO `sys_logininfor` VALUES (216, 'admin', '127.0.0.1', '内网IP', 'Chrome 9', 'Windows 10', '0', '登录成功', '2022-04-06 23:38:25');
+INSERT INTO `sys_logininfor` VALUES (217, 'admin', '127.0.0.1', '内网IP', 'Chrome 9', 'Windows 10', '0', '登录成功', '2022-04-07 18:55:28');
+INSERT INTO `sys_logininfor` VALUES (218, 'admin', '127.0.0.1', '内网IP', 'Chrome 9', 'Windows 10', '0', '登录成功', '2022-04-07 20:14:12');
+INSERT INTO `sys_logininfor` VALUES (219, 'admin', '127.0.0.1', '内网IP', 'Chrome 9', 'Windows 10', '0', '登录成功', '2022-04-07 21:35:54');
 
 -- ----------------------------
 -- Table structure for sys_menu
@@ -1710,7 +1713,7 @@ CREATE TABLE `sys_oper_log`  (
   `error_msg` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '错误消息',
   `oper_time` datetime NULL DEFAULT NULL COMMENT '操作时间',
   PRIMARY KEY (`oper_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 736 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '操作日志记录' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 778 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '操作日志记录' ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Records of sys_oper_log
@@ -2351,6 +2354,48 @@ INSERT INTO `sys_oper_log` VALUES (732, '会员签约', 2, 'com.jlt.csa.controll
 INSERT INTO `sys_oper_log` VALUES (733, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"120\",\"contractId\":103,\"gardenName\":\"AAA\",\"farmerName\":\"范诚诚\",\"gardenId\":3}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-06 22:12:40');
 INSERT INTO `sys_oper_log` VALUES (734, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"122\",\"contractId\":103,\"gardenName\":\"AAAA\",\"farmerName\":\"范诚诚\",\"gardenId\":3}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-06 22:13:50');
 INSERT INTO `sys_oper_log` VALUES (735, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"大观园\",\"farmerName\":\"程开州\",\"gardenId\":6}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-06 23:39:09');
+INSERT INTO `sys_oper_log` VALUES (736, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"AAA\",\"farmerName\":\"程开州\",\"gardenId\":6}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 20:46:03');
+INSERT INTO `sys_oper_log` VALUES (737, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":6}', NULL, 1, '', '2022-04-07 21:37:54');
+INSERT INTO `sys_oper_log` VALUES (738, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":6}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 21:39:53');
+INSERT INTO `sys_oper_log` VALUES (739, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":6}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 21:43:09');
+INSERT INTO `sys_oper_log` VALUES (740, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":6}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 21:45:48');
+INSERT INTO `sys_oper_log` VALUES (741, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":6}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 21:47:56');
+INSERT INTO `sys_oper_log` VALUES (742, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":6}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 21:50:06');
+INSERT INTO `sys_oper_log` VALUES (743, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":6}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 21:58:47');
+INSERT INTO `sys_oper_log` VALUES (744, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":5}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 21:59:27');
+INSERT INTO `sys_oper_log` VALUES (745, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":5}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 22:02:22');
+INSERT INTO `sys_oper_log` VALUES (746, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":5}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 22:03:54');
+INSERT INTO `sys_oper_log` VALUES (747, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":5}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 22:04:09');
+INSERT INTO `sys_oper_log` VALUES (748, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":6}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 22:04:35');
+INSERT INTO `sys_oper_log` VALUES (749, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":6}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 22:12:29');
+INSERT INTO `sys_oper_log` VALUES (750, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":5}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 22:13:20');
+INSERT INTO `sys_oper_log` VALUES (751, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":5}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 22:14:57');
+INSERT INTO `sys_oper_log` VALUES (752, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":5}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 22:15:00');
+INSERT INTO `sys_oper_log` VALUES (753, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":5}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 22:16:35');
+INSERT INTO `sys_oper_log` VALUES (754, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":5}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 22:16:45');
+INSERT INTO `sys_oper_log` VALUES (755, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":5}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 22:16:48');
+INSERT INTO `sys_oper_log` VALUES (756, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":5}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 22:16:51');
+INSERT INTO `sys_oper_log` VALUES (757, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":5}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 22:17:13');
+INSERT INTO `sys_oper_log` VALUES (758, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":5}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 22:17:18');
+INSERT INTO `sys_oper_log` VALUES (759, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":5}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 22:17:26');
+INSERT INTO `sys_oper_log` VALUES (760, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":5}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 22:17:30');
+INSERT INTO `sys_oper_log` VALUES (761, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":5}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 22:17:36');
+INSERT INTO `sys_oper_log` VALUES (762, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":5}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 22:18:06');
+INSERT INTO `sys_oper_log` VALUES (763, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":5}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 22:18:22');
+INSERT INTO `sys_oper_log` VALUES (764, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":5}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 22:18:26');
+INSERT INTO `sys_oper_log` VALUES (765, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":5}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 22:18:29');
+INSERT INTO `sys_oper_log` VALUES (766, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":5}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 22:19:08');
+INSERT INTO `sys_oper_log` VALUES (767, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":5}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 22:19:43');
+INSERT INTO `sys_oper_log` VALUES (768, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":5}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 22:19:48');
+INSERT INTO `sys_oper_log` VALUES (769, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":5}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 22:20:10');
+INSERT INTO `sys_oper_log` VALUES (770, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":5}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 22:20:19');
+INSERT INTO `sys_oper_log` VALUES (771, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":5}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 22:20:19');
+INSERT INTO `sys_oper_log` VALUES (772, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":5}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 22:20:23');
+INSERT INTO `sys_oper_log` VALUES (773, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":5}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 22:20:26');
+INSERT INTO `sys_oper_log` VALUES (774, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13672226668\",\"contractId\":103,\"gardenName\":\"绝情谷\",\"farmerName\":\"范诚诚\",\"gardenId\":10}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 22:21:17');
+INSERT INTO `sys_oper_log` VALUES (775, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":10}', NULL, 1, '该菜地已被他人选定，无法认领！', '2022-04-07 22:21:51');
+INSERT INTO `sys_oper_log` VALUES (776, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":5}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 22:47:51');
+INSERT INTO `sys_oper_log` VALUES (777, '会员签约', 2, 'com.jlt.csa.controller.FarmerContractController.claim()', 'PUT', 1, 'admin', NULL, '/csa/contract/claim', '127.0.0.1', '内网IP', '{\"mobileNumber\":\"13588886666\",\"contractId\":102,\"gardenName\":\"梦幻乐园\",\"farmerName\":\"程开州\",\"gardenId\":8}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-04-07 22:48:14');
 
 -- ----------------------------
 -- Table structure for sys_post
@@ -2561,7 +2606,7 @@ CREATE TABLE `sys_user`  (
 -- ----------------------------
 -- Records of sys_user
 -- ----------------------------
-INSERT INTO `sys_user` VALUES (1, 103, 'admin', '超级管理员', '00', '', '', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', '2022-04-06 23:38:25', 'admin', '2022-03-20 21:45:25', '', '2022-04-06 23:38:25', '管理员');
+INSERT INTO `sys_user` VALUES (1, 103, 'admin', '超级管理员', '00', '', '', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', '2022-04-07 21:35:54', 'admin', '2022-03-20 21:45:25', '', '2022-04-07 21:35:54', '管理员');
 INSERT INTO `sys_user` VALUES (2, 101, 'boss', '农场管理员', '00', '', '', '2', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', '2022-03-20 21:45:25', 'admin', '2022-03-20 21:45:25', 'admin', '2022-03-29 17:51:59', '');
 INSERT INTO `sys_user` VALUES (100, 104, '101', '场长', '00', '88@66.com', '18888888888', '0', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', '2022-03-30 22:05:56', 'admin', '2022-03-29 18:18:00', 'admin', '2022-03-30 22:05:56', NULL);