Przeglądaj źródła

增加渠道,私有,签单一次排序,用于已排序字段一致导致排序刷新互换

anderx 4 lat temu
rodzic
commit
1b54aeab38

+ 3 - 2
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -472,6 +472,7 @@
 		 <if test="sortType == 1">
 		 		desc
 		 </if>
+		 ,a.`number`
 		 <if test="page_sql != null">
     		${page_sql}
    		 </if> 
@@ -649,7 +650,7 @@
 		<if test="area != null">
 			and b.location_area = #{area,jdbcType=INTEGER}
 		</if>
-		order by a.transfer_time desc
+		order by a.transfer_time desc,a.`number`
 		 <if test="page_sql != null">
     		${page_sql}
    		 </if>
@@ -2166,7 +2167,7 @@ inner join(
   <if test="startTime!=null and endTime !=null">
  	and a.create_time between #{startTime} and #{endTime}
  	</if>
- 	order by a.status ,a.create_time desc
+ 	order by a.status ,a.create_time desc,a.id
  	<if test="page_sql != null">
     		${page_sql}
    		 </if>

+ 6 - 6
src/main/resources/props/config_local.properties

@@ -2,13 +2,13 @@ dev.name=local
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #本地
-jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-jdbc.username=root
-jdbc.password=123456
-#测试
-#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.username=root
-#jdbc.password=aftdev
+#jdbc.password=123456
+#测试
+jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.username=root
+jdbc.password=aftdev
 #\u68c0\u6d4b\u6570\u636e\u5e93\u94fe\u63a5\u662f\u5426\u6709\u6548\uff0c\u5fc5\u987b\u914d\u7f6e
 jdbc.validationQuery=SELECT 'x'
 #\u521d\u59cb\u8fde\u63a5\u6570