From 94cb09808e33e267aa026e28f32c0935cfc529c1 Mon Sep 17 00:00:00 2001
From: niujiyi <18272501226@163.com>
Date: Fri, 30 Oct 2026 10:40:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E7=9D=A3=E7=AB=AF-=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=92=E5=BA=8F=EF=BC=8C=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/bo/EnforcementRegistrationBo.java    | 10 ++++++++++
 .../report/impl/LawEnfOfficerSericeImpl.java    | 17 +++++++++++++++--
 .../enforcementcode/LawEnfOfficerMapper.xml     | 10 +++++++++-
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationBo.java
index f9770542..1caedcd7 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationBo.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationBo.java
@@ -392,4 +392,14 @@ public class EnforcementRegistrationBo extends BaseEntity {
      * 街道名称
      */
     private String streetName;
+
+    /**
+     * 排序方向 asc/desc
+     */
+    private String isAsc;
+
+    /**
+     * 排序字段列
+     */
+    private String orderByColumn;
 }
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/impl/LawEnfOfficerSericeImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/impl/LawEnfOfficerSericeImpl.java
index cafe6bd2..69f129c1 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/impl/LawEnfOfficerSericeImpl.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/impl/LawEnfOfficerSericeImpl.java
@@ -11,15 +11,28 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 @Service
 @RequiredArgsConstructor
 public class LawEnfOfficerSericeImpl implements ILawEnfOfficerService {
 
     private final LawEnfOfficerMapper lawEnfOfficerMapper;
+
+    /**
+     * 构建分页对象：排序统一由 XML 中的 orderByColumn 白名单控制。
+     * 清空 MyBatis-Plus 的 OrderItem，避免 PageQuery 把驼峰列名转成下划线列名后，
+     * 在 SQL 里再追加一个排序字段（如 order by xzzf_count asc, xzzfCount asc）。
+     */
+    private <T> Page<T> buildPage(PageQuery pageQuery) {
+        Page<T> page = pageQuery.build();
+        // 排序只由 XML 中的 orderByColumn 白名单决定，清空 MP 的 OrderItem
+        page.setOrders(new ArrayList<>());
+        return page;
+    }
     @Override
     public TableDataInfo<EnforcementRegistrationVo> selectLawEnfOfficerPageList(PageQuery pageQuery, EnforcementRegistrationBo bo) {
-        Page<EnforcementRegistrationVo> list=lawEnfOfficerMapper.selectLawEnfOfficerPageList(pageQuery.build(),bo);
+        Page<EnforcementRegistrationVo> list=lawEnfOfficerMapper.selectLawEnfOfficerPageList(buildPage(pageQuery),bo);
         return TableDataInfo.build(list);
     }
 
@@ -30,7 +43,7 @@ public class LawEnfOfficerSericeImpl implements ILawEnfOfficerService {
 
     @Override
     public TableDataInfo<EnforcementRegistrationVo> selectLawEnfOfficerDetailsPageList(PageQuery pageQuery, EnforcementRegistrationBo bo) {
-        Page<EnforcementRegistrationVo> list=lawEnfOfficerMapper.selectLawEnfOfficerDetailsPageList(pageQuery.build(),bo);
+        Page<EnforcementRegistrationVo> list=lawEnfOfficerMapper.selectLawEnfOfficerDetailsPageList(buildPage(pageQuery),bo);
         return TableDataInfo.build(list);
     }
 }
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/LawEnfOfficerMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/LawEnfOfficerMapper.xml
index f31d46d6..0b9bf3bc 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/LawEnfOfficerMapper.xml
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/LawEnfOfficerMapper.xml
@@ -49,9 +49,17 @@
             <if test="bo.districtName!=null and bo.districtName !=''">
                 and t4.name like CONCAT('%', #{bo.districtName}, '%')
             </if>
+            <if test="bo.bureauDeptName!=null and bo.bureauDeptName !=''">
+                and t1.bureauDeptName like CONCAT('%', #{bo.bureauDeptName}, '%')
+            </if>
         </where>
         and t4.level = 3
-        order by t1.zfcs desc
+        order by
+        <choose>
+            <when test="bo.orderByColumn == 'zfcs'">zfcs</when>
+            <otherwise>zfcs</otherwise>
+        </choose>
+        <if test="bo.isAsc == 'desc'">desc</if>
     </sql>
 
     <select id="selectLawEnfOfficerPageList" resultType="com.zdxt.enforcementcode.domain.vo.EnforcementRegistrationVo">