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)) - order by enforcement_time desc + order by enforcement_time desc, id DESC LIMIT #{params.pageNum}, #{params.pageSize} @@ -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)) - order by enforcement_time desc + order by enforcement_time desc, id DESC @@ -524,7 +524,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ${params.dataScope} - order by enforcement_time desc + order by enforcement_time desc, id DESC @@ -1279,7 +1279,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and union_no = #{unionNo} and union_no is not null - order by enforcement_time desc + order by enforcement_time desc, id DESC 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" + + 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 + + - 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 from enterprise_information