Merge branch 'dev1.4' of http://192.168.3.207:10080/qmx/datatag into dev1.4

src/history/util_history.go

@@ -476,7 +476,7 @@ func AssembelSave(tmp map[string]interface{}, IsSearchHosp, IsSearchEnps bool, h
 		tmp["bidopentime"] = qu.Int64All(bidopentime)
 	}
 	//数据存到usermail，并且根据公告id去重
-	if dataTable == 1 && noticeFilter == 1 {
+	/*if dataTable == 1 && noticeFilter == 1 {
 		log.Println("datag", appid+"_"+qu.ObjToString(tmp["id"]))
 		isExists, err := redis.Exists("datag", appid+"_"+qu.ObjToString(tmp["id"]))
 		if err != nil {
@@ -485,7 +485,7 @@ func AssembelSave(tmp map[string]interface{}, IsSearchHosp, IsSearchEnps bool, h
 			log.Println("信息id重复 ", qu.ObjToString(tmp["id"]))
 			return
 		}
-	}
+	}*/
 	//存到mysql pushentniche表中，根据公告id去重
 	if dataTable == 2 {
 		isExist, err := redis.Exists("other", "entexportdata_"+qu.ObjToString(tmp["id"])+"_"+fmt.Sprintln(entId))
@@ -625,8 +625,8 @@ func AssembelSave(tmp map[string]interface{}, IsSearchHosp, IsSearchEnps bool, h
 	if isDis && tmp["winner_type"] == "集成商" {
 		return
 	}
-	if noticeFilter == 1 && dataTable == 0 && isOk {
-		ok := checkBidId(appid, id)
+	if noticeFilter == 1 && (dataTable == 0 || dataTable == 1) && isOk {
+		ok := checkBidId(appid, id, dataTable)
 		if !ok {
 			isOk = false
 			tmp["chongfu"] = id
@@ -1410,17 +1410,21 @@ func InitProjectId(appid string) {
 	}
 }
 
-func checkBidId(appid, id string) bool {
+func checkBidId(appid, id string, dataTable int) bool {
 	isOk := true
-	userMailData, ok := Mgo.FindOne(SaveUserMail, bson.M{"appid": appid, "id": id})
-	if ok && userMailData != nil && *userMailData != nil {
-		log.Println("用户 ", appid, " 在 ", SaveUserMail, " 中找到重复公告id ", id)
-		isOk = false
+	if dataTable == 1 {
+		count := MgoCus.Count(SaveUserMail, bson.M{"appid": appid, "id": id})
+		if count > 0 {
+			log.Println("用户 ", appid, " 在 ", SaveUserMail, " 中找到重复公告id ", id)
+			isOk = false
+		}
 	}
-	userHistoryData, oks := Mgo.FindOne(SaveColl, bson.M{"appid": appid, "id": id})
-	if oks && userHistoryData != nil && *userHistoryData != nil {
-		log.Println("用户 ", appid, " 在 ", SaveColl, " 中找到重复公告id ", id)
-		isOk = false
+	if dataTable == 0 {
+		count := Mgo.Count(SaveColl, bson.M{"appid": appid, "id": id})
+		if count > 0 {
+			log.Println("用户 ", appid, " 在 ", SaveColl, " 中找到重复公告id ", id)
+			isOk = false
+		}
 	}
 	return isOk
 }

src/web/templates/client/index.html

@@ -81,8 +81,8 @@
                                                             <option value=0>全局模式</option>
                                                             <option value=1>部门模式</option>
                                                             <option value=2>标签模式</option>
-                                                            <option value=3>部门+标签模式</option>
-                                                            <option value=4>规则模式(不去重)</option>
+<!--                                                            <option value=3>部门+标签模式</option>-->
+                                                            <option value=4>规则模式</option>
                                                         </select>
                                                     </div>
                                                 </div>
@@ -92,7 +92,7 @@
                                                     <div class="col-sm-3">
                                                         <select class="form-control" id="pushTypeSelect" disabled>
                                                             <option value=0 code="email">邮箱</option>
-                                                            <option value=1 code="interface">接口</option>
+                                                            <option value=1 code="interface">API</option>
                                                         </select>
                                                     </div>
                                                 </div>

src/web/templates/private/customer_edit.html

@@ -94,8 +94,8 @@
                                                         <option value=0>全局模式</option>
                                                         <option value=1>部门模式</option>
                                                         <option value=2>标签模式</option>
-                                                        <option value=3>部门+标签模式</option>
-                                                        <option value=4>规则模式(不去重)</option>
+<!--                                                        <option value=3>部门+标签模式</option>-->
+                                                        <option value=4>规则模式</option>
                                                     </select>
                                                 </div>
                                             </div>
@@ -104,7 +104,7 @@
                                                 <div class="col-sm-3">
                                                     <select class="form-control" id="pushTypeSelect">
                                                         <option value=0 code="email">邮箱</option>
-                                                        <option value=1 code="interface">接口</option>
+                                                        <option value=1 code="interface">API</option>
                                                     </select>
                                                 </div>
                                             </div>

src/web/templates/private/customer_edit_euser.html

@@ -71,8 +71,8 @@
                                                         <option value=0>全局模式</option>
                                                         <option value=1>部门模式</option>
                                                         <option value=2>标签模式</option>
-                                                        <option value=3>部门+标签模式</option>
-                                                        <option value=4>规则模式(不去重)</option>
+<!--                                                        <option value=3>部门+标签模式</option>-->
+                                                        <option value=4>规则模式</option>
                                                     </select>
                                                 </div>
                                             </div>
@@ -81,7 +81,7 @@
                                                 <div class="col-sm-3">
                                                     <select class="form-control selectpicker" id="pushTypeSelect" disabled>
                                                         <option value=0 code="email">邮箱</option>
-                                                        <option value=1 code="interface">接口</option>
+                                                        <option value=1 code="interface">API</option>
                                                     </select>
                                                 </div>
                                             </div>

src/web/templates/private/customer_history.html

@@ -119,10 +119,6 @@
                                                             if (val == 2) {
                                                                 $("#pushIsDup option[value='" + 1 + "']").attr("selected", true);
                                                                 $("button[data-id=pushIsDup]").find(".filter-option-inner-inner").text("是");
-                                                            } else {
-                                                                $("#pushIsDup option[value='" + 1 + "']").attr("selected", false);
-                                                                $("#pushIsDup option[value='" + 0 + "']").attr("selected", true);
-                                                                $("button[data-id=pushIsDup]").find(".filter-option-inner-inner").text("否");
                                                             }
                                                         })
                                                     </script>
@@ -376,12 +372,15 @@
             }
             if (dataMap.i_pushmodel != undefined) {
                 $('#pushModelSelect').val(dataMap.i_pushmodel);
+                $("#pushModelSelect").selectpicker("refresh")
             }
             if (dataMap.i_extfieldstype != undefined) {
                 $('#extfiledselect').val(dataMap.i_extfieldstype);
+                $("#pushTypeSelect").selectpicker("refresh")
             }
             if (dataMap.i_pushtype != undefined) {
                 $('#pushTypeSelect').val(dataMap.i_pushtype);
+                $("#pushTypeSelect").selectpicker("refresh")
             }
             // if (dataMap.i_pushtype == 0) {
             //     $('#pushTypeSelect').val(0)