xiugai

src/jfw/modules/pushentniche/src/push/job/movejob.go

@@ -17,7 +17,7 @@ import (
 )
 
 var (
-	MoveFields = []string{"entid", "entname", "deptid", "words", "ratemode", "apppush", "mailpush", "timestamp", "size"}
+	MoveFields = []string{"entid", "entname", "deptid", "words", "ratemode", "apppush", "mailpush", "timestamp"}
 )
 
 type MoveUser struct {
@@ -157,7 +157,7 @@ func (m *MoveJob) merge(number *int, nowUnix int64, moveUsers map[string]*MoveUs
 			}
 			if uniques[0] == "dis" {
 				query = map[string]interface{}{
-					"distributeid": util.IntAll(uniques[2]),
+					"distributeid": util.ObjToString(uniques[2]),
 				}
 			} else if uniques[0] == "dept" {
 				query = map[string]interface{}{
@@ -204,28 +204,22 @@ func (m *MoveJob) merge(number *int, nowUnix int64, moveUsers map[string]*MoveUs
 					}
 					newList = append(newList, vv)
 				}
-				pLength := len(newList)
-				if pLength == 0 {
-					invalidArray_delete = append(invalidArray_delete, moveUser.ids...)
-					if len(invalidArray_delete) == Config.BigBulkSize {
-						m.delBulk(sess, &invalidArray_delete)
-					}
-					return
-				}
-				rLength := len(*oldList)
-				maxPushSize := Config.MaxPushSize
 				upSet := map[string]interface{}{}
-				if rLength+pLength > maxPushSize {
-					newList = append(newList, *oldList...)
-					sort.Sort(newList)
-					setMap["list"] = newList[:maxPushSize]
-					setMap["size"] = maxPushSize
-				} else { //追加
-					setMap["size"] = rLength + pLength
-					upSet["$push"] = map[string]interface{}{
-						"list": map[string]interface{}{
-							"$each": newList,
-						},
+				if pLength := len(newList); pLength > 0 {
+					rLength := len(*oldList)
+					maxPushSize := Config.MaxPushSize
+					if rLength+pLength > maxPushSize {
+						newList = append(newList, *oldList...)
+						sort.Sort(newList)
+						setMap["list"] = newList[:maxPushSize]
+						setMap["size"] = maxPushSize
+					} else { //追加
+						setMap["size"] = rLength + pLength
+						upSet["$push"] = map[string]interface{}{
+							"list": map[string]interface{}{
+								"$each": newList,
+							},
+						}
 					}
 				}
 				upSet["$set"] = setMap