Merge branch 'dev' of http://gitlab.91isoft.com:90/wangfei/vehicle-quality-review into wangdingyi

quality-review/src/main/resources/mapper/AutomobileEnterpriseMapper.xml

@@ -53,17 +53,18 @@
             resultMap="AutomobileEnterpriseResult">
         <include refid="selectAutomobileEnterpriseListSQL"/>
         <where>
-            deleted = 0
-            <if test="enterpriseName != null  and enterpriseName != ''">and enterprise_name like concat('%',
+            ae.deleted = 0
+            <if test="enterpriseName != null  and enterpriseName != ''">and ae.enterprise_name like concat('%',
                 #{enterpriseName}, '%')
             </if>
-            <if test="address != null  and address != ''">and address like concat('%', #{address}, '%')</if>
-            <if test="postcode != null  and postcode != ''">and postcode like concat('%', #{postcode}, '%')</if>
+            <if test="address != null  and address != ''">and ae.address like concat('%', #{address}, '%')</if>
+            <if test="postcode != null  and postcode != ''">and ae.postcode like concat('%', #{postcode}, '%')</if>
             <if test="enterpriseContact != null  and enterpriseContact != ''">
-                and enterprise_contact like concat('%', #{enterpriseContact}, '%')
+                and ae.enterprise_contact like concat('%', #{enterpriseContact}, '%')
             </if>
-            <if test="contactNumber != null  and contactNumber != ''">and contact_number like concat('%', #{contactNumber}, '%')</if>
+            <if test="contactNumber != null  and contactNumber != ''">and ae.contact_number like concat('%', #{contactNumber}, '%')</if>
         </where>
+        order by ae.create_time desc
     </select>
 
     <select id="selectAutomobileEnterpriseById" parameterType="Long" resultMap="AutomobileEnterpriseResult">