|
@@ -1159,10 +1159,10 @@ func autoDraw(mode, cluename, phone string, isGroup, isCommerce int) (positionId
|
|
positionId = common.Int64All((*cdata)[0]["position_id"])
|
|
positionId = common.Int64All((*cdata)[0]["position_id"])
|
|
noticePositionId = positionId
|
|
noticePositionId = positionId
|
|
seatNumber = common.ObjToString((*cdata)[0]["seatNumber"])
|
|
seatNumber = common.ObjToString((*cdata)[0]["seatNumber"])
|
|
- assign_type := common.IntAll((*cdata)[0]["assign_type"])
|
|
|
|
- role_id := common.IntAll((*cdata)[0]["role_id"])
|
|
|
|
for _, v := range *pdata {
|
|
for _, v := range *pdata {
|
|
resign := common.IntAll(v["resign"])
|
|
resign := common.IntAll(v["resign"])
|
|
|
|
+ assign_type := common.IntAll(v["assign_type"])
|
|
|
|
+ role_id := common.IntAll(v["role_id"])
|
|
if positionId == common.Int64All(v["position_id"]) {
|
|
if positionId == common.Int64All(v["position_id"]) {
|
|
if resign == 0 && (assign_type == 1 || role_id == 8) {
|
|
if resign == 0 && (assign_type == 1 || role_id == 8) {
|
|
if FindUpperLimit(gconv.String(positionId), mode, true) {
|
|
if FindUpperLimit(gconv.String(positionId), mode, true) {
|