From 1d4fb1d390104afc3176ca367ba0eafff89edea0 Mon Sep 17 00:00:00 2001
From: shil <452061493@qq.com>
Date: Tue, 9 Jun 2026 15:59:56 +0800
Subject: [PATCH] =?UTF-8?q?sql=E6=97=B6=E9=97=B4=E6=88=B3=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/EnforcementRegistrationMapper.xml     | 16 ++++++++--------
 .../mapper/EnterpriseInformationMapper.xml       | 10 +++++++---
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
index 9e02169b..3117304d 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
@@ -175,7 +175,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and (law_enforcer_id = #{dataScopeId} or user_id = #{dataScopeId} or law_enforcer_id = #{dataScopeId} or FIND_IN_SET(#{dataScopeId}, law_enforcer_id_two))
             </if>
         </where>
-        order by enforcement_time desc
+        order by enforcement_time desc, id DESC
         <if test="params.pageNum != null and params.pageSize != null"><!-- 开始时间检索 -->
             LIMIT #{params.pageNum}, #{params.pageSize}
         </if>
@@ -276,7 +276,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and (law_enforcer_id = #{dataScopeId} or user_id = #{dataScopeId} or law_enforcer_id = #{dataScopeId} or FIND_IN_SET(#{dataScopeId}, law_enforcer_id_two))
             </if>
         </where>
-        order by enforcement_time desc
+        order by enforcement_time desc, id DESC
     </select>
 
     <select id="selectEnforcementRegistrationListNew" parameterType="EnforcementRegistration" resultMap="EnforcementRegistrationResult">
@@ -363,7 +363,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 ${params.dataScope}
             </if>
         </where>
-        GROUP BY enterprise_number order by enforcement_time desc) t
+        GROUP BY enterprise_number order by enforcement_time desc, id DESC) t
         <where>
           <if test="numLeft != null and numLeft != ''">
             and t.num &gt;= #{numLeft}
@@ -449,7 +449,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <!--                ${params.dataScope}-->
 <!--            </if>-->
         </where>
-        order by enforcement_time desc
+        order by enforcement_time desc, id DESC
     </select>
 
 
@@ -524,7 +524,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 ${params.dataScope}
             </if>
         </where>
-            order by enforcement_time desc
+            order by enforcement_time desc, id DESC
     </select>
 
     <select id="selectEnforcementRegistrationAndAddressList" parameterType="EnforcementRegistration" resultMap="EnforcementRegistrationResult">
@@ -687,7 +687,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
         </where>
         GROUP BY  IFNULL(union_no, RAND())
-        order by enforcement_time desc
+        order by enforcement_time desc, id DESC
     </select>
 
 
@@ -1279,7 +1279,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="unionNo != null and unionNo !=''"> and union_no = #{unionNo}</if>
             and union_no is not null
         </where>
-        order by enforcement_time desc
+        order by enforcement_time desc, id DESC
     </select>
 
     <select id="outTimeByUnion" parameterType="EnforcementRegistration" resultType="int">
@@ -1293,7 +1293,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="unionNo != null and unionNo !=''"> and union_no = #{unionNo}</if>
             and union_no is not null
         </where>
-        order by enforcement_time desc
+        order by enforcement_time desc, id DESC
     </select>
 
     <update id="updateRegToUnionFlag" parameterType="EnforcementRegistration">
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml
index cdd32cfa..7e301a90 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml
@@ -29,9 +29,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="qrCodeUrl"    column="qr_code_url"    />
     </resultMap>
 
+    <sql id="selectEnterpriseInformationColumns">
+        id, enterprise_name, enterprise_number, enterprise_type, company_org_type, enterprise_address, legal_person, registered_capital, establishment_time,
+        operating_term, business_scope, create_time, create_by, user_id, dept_id, is_unsubscribe, is_delete, salt, enterprise_tel, industry, operating_term_end
+    </sql>
+
     <sql id="selectEnterpriseInformationVo">
-        select id, enterprise_name, enterprise_number, enterprise_type, company_org_type, enterprise_address, legal_person, registered_capital, establishment_time,
-        operating_term, business_scope, create_time, create_by, user_id, dept_id,is_unsubscribe ,is_delete,salt,enterprise_tel,industry,operating_term_end  from enterprise_information
+        select <include refid="selectEnterpriseInformationColumns"/> from enterprise_information
     </sql>
 
     <select id="selectEnterpriseInformationList" parameterType="EnterpriseInformation" resultMap="EnterpriseInformationResult">
@@ -107,7 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="selectEnterpriseInformationAndQrInfo" parameterType="EnterpriseInformation" resultMap="EnterpriseInformationResult">
             SELECT
-                ei.*,gh.qr_code_url
+                <include refid="selectEnterpriseInformationColumns"/>, gh.qr_code_url
             FROM
                 enterprise_information ei
                 LEFT JOIN (