榜单列表查询修改

@@ -6,6 +6,7 @@ require (
 	github.com/aliyun/alibaba-cloud-sdk-go v1.60.348
 	github.com/astaxie/beego v1.10.0
 	github.com/disintegration/imaging v1.6.2
+	github.com/gin-gonic/gin v1.4.0
 	github.com/go-sql-driver/mysql v1.4.1
 	github.com/gomodule/redigo v1.7.0
 	github.com/gorilla/websocket v1.4.1

 package utils
 
 import (
+	"encoding/json"
 	"fmt"
 	"testing"
 )
@@ -58,3 +59,15 @@ func TestMergeMap(t *testing.T) {
 	MergeMap(to, from)
 	t.Log("merge 后:", to)
 }
+
+func TestIntUnmarsh(t *testing.T) {
+	jsonString := `{"id":8242051651122944}`
+	type param struct {
+		Id int `json:"id"`
+	}
+	var p param
+	json.Unmarshal([]byte(jsonString), &p)
+	t.Log(p)
+	jsonByte, _ := json.Marshal(p)
+	t.Log(string(jsonByte))
+}

@@ -74,9 +74,7 @@ func GetRankList(header *protocol.RequestHeader, request *protocol.GetRankListRe
 				log.Error(err)
 				return
 			}
-			if !hasDepartmentInRank {
-				continue
-			}
+			if hasDepartmentInRank {
 				if departmentId > 0 {
 					if err = models.GetRanksByDepartmentSelf(header.CompanyId, request.RankTypeId, request.RankRangeId, request.RankPeriodId, key, departmentId, &selfRank); err != nil {
 						log.Error(err)
@@ -98,6 +96,7 @@ func GetRankList(header *protocol.RequestHeader, request *protocol.GetRankListRe
 						hasDepartmentInRank = false
 					}
 				}
+			}
 		} else if rankRange.Type == protocol.RankRangeTypeAllCompanyUser || rankRange.Type == protocol.RankRangeTypeSpecifyUser {
 			if rsp.Total, err = models.GetRanksByUser(header.CompanyId, request.RankTypeId, request.RankRangeId, request.RankPeriodId, key, request.PageIndex, request.PageSize, &ranks); err != nil && err != orm.ErrNoRows {
 				log.Error(err)