From c11659335d446a87ca1070d5108e5dd313f416f3 Mon Sep 17 00:00:00 2001
From: liujiang <569804566@qq.com>
Date: Thu, 14 Aug 2025 20:57:28 +0800
Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E7=AE=A1=E7=90=86=E5=91=98?=
 =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E8=8F=9C=E5=8D=95=E8=B0=83=E4=BC=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ertRoundController.java => AdvertRoundAdminController.java} | 2 +-
 xkt/src/main/resources/mapper/AdvertRoundMapper.xml            | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
 rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/{AdminAdvertRoundController.java => AdvertRoundAdminController.java} (98%)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/AdminAdvertRoundController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/AdvertRoundAdminController.java
similarity index 98%
rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/AdminAdvertRoundController.java
rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/AdvertRoundAdminController.java
index ba2f28986..323a170df 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/AdminAdvertRoundController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/AdvertRoundAdminController.java
@@ -30,7 +30,7 @@ import javax.validation.Valid;
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/rest/v1/ad-rounds/admin")
-public class AdminAdvertRoundController extends XktBaseController {
+public class AdvertRoundAdminController extends XktBaseController {
 
     final IAdminAdvertRoundService adminAdvertRoundService;
 
diff --git a/xkt/src/main/resources/mapper/AdvertRoundMapper.xml b/xkt/src/main/resources/mapper/AdvertRoundMapper.xml
index 3f91fedb0..17a59ab0b 100644
--- a/xkt/src/main/resources/mapper/AdvertRoundMapper.xml
+++ b/xkt/src/main/resources/mapper/AdvertRoundMapper.xml
@@ -109,7 +109,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="roundId != null "> and ar.round_id = #{roundId}</if>
             <if test="sysIntercept != null "> and ar.sys_intercept = #{sysIntercept}</if>
         ORDER BY
-            ar.advert_id
+            ar.advert_id,
+            ar.portion
     </select>