From c2f7c35db9ab95f9d8d8fa07499e6c60bf9dc7a2 Mon Sep 17 00:00:00 2001
From: SjS <email@example.com>
Date: Sat, 26 Apr 2025 11:59:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E6=96=B0=E5=A2=9E=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bst/agreement/mapper/AgreementMapper.java      |  1 -
 .../ruoyi/bst/agreement/mapper/AgreementMapper.xml |  6 ------
 .../bst/agreement/service/AgreementService.java    |  1 -
 .../service/impl/AgreementServiceImpl.java         | 10 +---------
 .../com/ruoyi/web/app/AppAgreementController.java  | 14 +++++++++++++-
 5 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/mapper/AgreementMapper.java b/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/mapper/AgreementMapper.java
index 4b13abf..0ce2b86 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/mapper/AgreementMapper.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/mapper/AgreementMapper.java
@@ -74,5 +74,4 @@ public interface AgreementMapper
 
     public int selectDistinct(@Param("query") AgreementQuery agreement);
 
-    public AgreementVO selectLatest(AgreementQuery query);
 }
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/mapper/AgreementMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/mapper/AgreementMapper.xml
index 35c3f96..914ed32 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/mapper/AgreementMapper.xml
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/mapper/AgreementMapper.xml
@@ -68,12 +68,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where bag.id = #{id} 
     </select>
 
-    <!--查询最新的协议信息-->
-    <select id="selectLatest" resultType="com.ruoyi.bst.agreement.domain.AgreementVO">
-        <include refid="selectAgreementVo"></include>
-        where bag.area_id = #{areaId} and bag.agreement_type = #{agreementType}
-        order by create_time desc limit 1
-    </select>
 
     <select id="selectDistinct" resultType="java.lang.Integer">
         select count(1) from <include refid="searchTables"/>
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/service/AgreementService.java b/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/service/AgreementService.java
index 47f5c0a..778a017 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/service/AgreementService.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/service/AgreementService.java
@@ -61,5 +61,4 @@ public interface AgreementService
      */
     public int deleteAgreementById(Long id);
 
-    AgreementVO selectLatest(AgreementQuery query);
 }
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/service/impl/AgreementServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/service/impl/AgreementServiceImpl.java
index 132e500..032b843 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/service/impl/AgreementServiceImpl.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/service/impl/AgreementServiceImpl.java
@@ -157,13 +157,5 @@ public class AgreementServiceImpl implements AgreementService
         return agreementMapper.deleteAgreementById(id);
     }
 
-    /**
-     * 查询最新的协议信息
-     * @param query
-     * @return
-     */
-    @Override
-    public AgreementVO selectLatest(AgreementQuery query) {
-        return agreementMapper.selectLatest(query);
-    }
+
 }
diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/app/AppAgreementController.java b/ruoyi-web/src/main/java/com/ruoyi/web/app/AppAgreementController.java
index 2bc9014..3dd93ed 100644
--- a/ruoyi-web/src/main/java/com/ruoyi/web/app/AppAgreementController.java
+++ b/ruoyi-web/src/main/java/com/ruoyi/web/app/AppAgreementController.java
@@ -1,5 +1,6 @@
 package com.ruoyi.web.app;
 
+import com.github.pagehelper.PageHelper;
 import com.ruoyi.bst.agreement.domain.AgreementQuery;
 import com.ruoyi.bst.agreement.service.AgreementService;
 import com.ruoyi.common.core.controller.BaseController;
@@ -18,7 +19,18 @@ public class AppAgreementController extends BaseController {
     @ApiOperation("查询最新协议")
     @GetMapping("/latest")
     public AjaxResult getAgreement(AgreementQuery query) {
-        return success(agreementService.selectLatest(query));
+        PageHelper.startPage(1, 1);
+        PageHelper.orderBy("create_time desc");
+        if (query.getContentType()==null) {
+            return AjaxResult.error("内容类型不能为空");
+        }
+        if (query.getAgreementType()==null) {
+            return AjaxResult.error("协议类型不能为空");
+        }
+        if (query.getAreaId()==null) {
+            return AjaxResult.error("运营区不能为空");
+        }
+        return success(agreementService.selectAgreementList(query));
     }