|
|
@@ -1035,6 +1035,7 @@ func autoDraw(mode, cluename, phone string, isGroup, isCommerce int) (positionId
|
|
|
upperLimitPersonMap := map[int64]bool{}
|
|
|
upperLimitCdataNew := []map[string]interface{}{}
|
|
|
upperLimitCount := 0
|
|
|
+ isFull := false
|
|
|
for _, m := range *cdata {
|
|
|
positionid := gconv.Int64(m["position_id"])
|
|
|
for _, v := range *pdata {
|
|
|
@@ -1058,6 +1059,7 @@ func autoDraw(mode, cluename, phone string, isGroup, isCommerce int) (positionId
|
|
|
//没有达上限的人数为0 全部都是达上限的
|
|
|
personMap = upperLimitPersonMap
|
|
|
cdataNew = upperLimitCdataNew
|
|
|
+ isFull = true
|
|
|
}
|
|
|
}
|
|
|
//查询是否都有没有离职
|
|
|
@@ -1117,7 +1119,7 @@ func autoDraw(mode, cluename, phone string, isGroup, isCommerce int) (positionId
|
|
|
noticePositionId = positionId
|
|
|
saleName = common.ObjToString(data["saleName"])
|
|
|
seatNumber = common.ObjToString(data["seatNumber"])
|
|
|
- if upperLimitCount == len(personMap) {
|
|
|
+ if isFull {
|
|
|
isFreeze = true
|
|
|
positionId = positionId
|
|
|
noticePositionId = 0
|
|
|
@@ -1131,7 +1133,7 @@ func autoDraw(mode, cluename, phone string, isGroup, isCommerce int) (positionId
|
|
|
noticePositionId = positionId
|
|
|
seatNumber = common.ObjToString(data["seatNumber"])
|
|
|
saleName = common.ObjToString(data["saleName"])
|
|
|
- if upperLimitCount == len(personMap) {
|
|
|
+ if isFull {
|
|
|
isFreeze = true
|
|
|
positionId = 0
|
|
|
noticePositionId = positionId
|
