Merge branch 'master' of http://47.100.37.243:10080/wutt/game.git

minigame/WebContent/result_all.html

@@ -21,9 +21,10 @@
 					console.log(resp.code);
 				}else{
 					for(let index in resp.data){
+					    var sequence = parseInt(index) + 1;
 						$("table").append(
 								"<tr><td>" + 
-								(index + 1) +
+								sequence +
 								"</td><td>" +
 								resp.data[index].nickName + 
 								"</td><td>" +

minigame/WebContent/user_statistics.html

@@ -21,7 +21,8 @@
 					console.log(resp.code);
 				}else{
 					for(let index in resp.data){
-					    var str = "<tr><td>" + (index + 1) + "</td><td>";
+                        var sequence = parseInt(index) + 1;
+					    var str = "<tr><td>" + sequence + "</td><td>";
 					    if(resp.data[index].city == null || resp.data[index].city == ""){
 					        str += "未知</td><td>";
                         }else{

minigame/src/com/hssx/mapper/UserMapper.xml

@@ -321,6 +321,6 @@
     where id = #{id,jdbcType=VARCHAR}
   </update>
   <select id="countUserGroupByCity" parameterType="com.hssx.entity.UserExample" resultMap="CityCountResultMap">
-    SELECT city, COUNT(*) AS quantity FROM mini_user GROUP BY city;
+    SELECT city, COUNT(*) AS quantity FROM mini_user GROUP BY city ORDER BY quantity DESC;
   </select>
 </mapper>