Merge branch 'master' of http://192.168.3.207:10080/qmx/jy-data-extract

src/jy/admin/audit/dataaudit.go

@@ -55,7 +55,7 @@ func AuditOne(c *gin.Context) {
 	start, _ := strconv.Atoi(startstr)
 	limit, _ := strconv.Atoi(limitstr)
 	query := make(map[string]interface{})
-	if source == "-1" { //外层
+	if source == "-1" && coll != "" { //外层
 		query = map[string]interface{}{
 			name + "_err": map[string]interface{}{
 				"$exists": true,

src/jy/admin/audit/rulemanager.go

@@ -243,7 +243,6 @@ func SaveRule(c *gin.Context) {
 		if len(*d) > 0 {
 			c.JSON(200, gin.H{"msg": "已存在！"})
 		} else {
-
 			data["l_lasttime"] = time.Now().Unix()
 			data["l_date"] = time.Now().Unix()
 			data["s_user"] = session.Get("username")
@@ -273,13 +272,13 @@ func Shift(c *gin.Context) {
 	if str == "" {
 		c.JSON(200, gin.H{"rep": false})
 	} else {
-		b := Mgo.Update("rc_rule", `{"_id":"`+strs[0]+`","delete":false}`, &map[string]interface{}{
+		b := Mgo.Update("rc_rule", `{"_id":"`+strs[0]+`"}`, &map[string]interface{}{
 			"$set": map[string]interface{}{
 				"i_order": qu.IntAll(strs[3]),
 			},
 		}, false, false)
 		if b {
-			Mgo.Update("rc_rule", `{"_id":"`+strs[2]+`","delete":false}`, &map[string]interface{}{
+			Mgo.Update("rc_rule", `{"_id":"`+strs[2]+`"}`, &map[string]interface{}{
 				"$set": map[string]interface{}{
 					"i_order": qu.IntAll(strs[1]),
 				},