Merge branch 'dev_v2.9.44.1_wh' of jianyu/ent_new into hotfix/v2.9.44.1

entniche_new/src/service/subscribe/subscribe.go

@@ -2,7 +2,6 @@
 package subscribe
 
 import (
-	"app.yhyue.com/moapp/message/db"
 	"encoding/json"
 	"entniche_new/src/config"
 	"fmt"
@@ -1763,34 +1762,20 @@ func (ac *Action) updateEntnicheRule(parameter_name string, parameter interface{
 	}}, true, false)
 	//企业订阅修改记录
 	if bl {
-		dataList, _ := util.MQFW.Find("entniche_rule", query, `{"o_vipjy":1,"o_member_jy":1,"o_jy":1}`, nil, true, -1, -1)
+		dataList, _ := util.MQFW.Find("entniche_rule", query, `{"o_entniche":1}`, nil, true, -1, -1)
 		util.MQFW.Update("entniche_rule", query, bson.M{"$set": bson.M{
 			"l_updatetime":                 time.Now().Unix(),
 			"o_entniche." + parameter_name: parameter,
 		}}, true, false)
 		if dataList != nil && len(*dataList) > 0 {
 			data := (*dataList)[0]
-			switch identity {
-			case "ent":
-				if entInfo.Role_admin_department && entInfo.Ent.Dept_subscribe == 1 { //部门管理员且有权力
-					data["i_deptid"] = entInfo.Dept.Id
-					data["i_entid"] = entId
-
-				} else if entInfo.Role_admin_system { //企业管理员
-					data["i_entid"] = entId
-					data["i_deptid"] = map[string]interface{}{
-						"$exists": false,
-					}
-					data["i_userid"] = map[string]interface{}{
-						"$exists": false,
-					}
-				}
-			case "pers":
-				data["i_userid"] = entUserId
-				data["i_entid"] = entId
-				data["i_type"] = i_type
-			}
-			go db.Mgo_Log.Save("entjy_log", data)
+			data["i_userid"] = entUserId
+			data["i_entid"] = entId
+			data["i_type"] = i_type
+			data["i_deptid"] = entInfo.Dept.Id
+			data["createtime"] = time.Now().Unix()
+			data["userid"] = qutil.IntAll(ac.GetSession("userId"))
+			fmt.Println(util.Mgo_Log.Save("ovipjy_log", data))
 		}
 	}
 	return bl