获取appid修改

JySEPlatform/client/client.go

@@ -4,6 +4,7 @@ import (
 	. "JySEPlatform/util"
 	"encoding/json"
 	"fmt"
+	"log"
 	"regexp"
 	"strconv"
 	"strings"
@@ -159,12 +160,15 @@ func (c *Client) CuserRuleCreate() {
 		i_createtime := time.Now().Unix()
 		data["i_updatetime"] = i_createtime
 		data["s_updateuser"] = sessVal["entUserName"]
-		query := bson.M{
-			"phone":    sessVal["phone"],
-			"username": sessVal["name"],
-		}
-		entMgoInfo, _ := MgoCus.FindOne("user", query)
+		entMgoInfo, _ := MgoCus.FindOne("user", bson.M{"entid": sessVal["entId"]})
 		appid := qu.ObjToString((*entMgoInfo)["appid"])
+		if appid == "" {
+			log.Println("appid 异常, ", sessVal["entUserId"])
+			c.ServeJson(map[string]interface{}{
+				"rep": false,
+			})
+			return
+		}
 		var rep = false
 		if id == "" { //新建
 			if entUserId == 0 {

JySEPlatform/front/front.go

@@ -480,11 +480,7 @@ func LoginCheck(f *Front, entId int, loginUser map[string]interface{}, userPhone
 		return
 	}
 	// 4. mongo库查询与之关联的企业appid
-	query := bson.M{
-		"phone":    (*entInfo)[0]["phone"],
-		"username": (*entInfo)[0]["name"],
-	}
-	entMgoInfo, ok := MgoCus.FindOne("user", query)
+	entMgoInfo, ok := MgoCus.FindOne("user", bson.M{"entid": entId})
 	if !ok || entMgoInfo == nil || len(*entMgoInfo) == 0 {
 		//	企业信息查询失败
 		f.ServeJson(map[string]interface{}{

JySEPlatform/service/private_service.go

@@ -165,13 +165,14 @@ func (f *Private) Keydatademo(world string) {
 				}
 				repeatResp, err := RepeatRpc(repeatReq)
 				if err != nil {
-					log.Println("数据去重rpc接口调用失败")
-				}
-				for _, v := range rdata {
-					if repeatResp[qu.ObjToString(v["id"])] {
-						v["usermail_exist"] = false
-					} else {
-						v["usermail_exist"] = true
+					log.Println("数据去重rpc接口调用失败: ", err.Error())
+				} else {
+					for _, v := range rdata {
+						if repeatResp[qu.ObjToString(v["id"])] {
+							v["usermail_exist"] = false
+						} else {
+							v["usermail_exist"] = true
+						}
 					}
 				}
 				tmp["data"] = rdata
@@ -343,11 +344,11 @@ func (f *Private) Keydataaccount(world string) {
 			isExport = false
 			reason = append(reason, "企业数据流量包余额不足")
 		}
-		if int64(len(newIdArr)) > resp.Data.Num2 {
+		if int64(len(newIdArr)) > resp.Data.Num3 {
 			isExport = false
 			reason = append(reason, "超出您的每日导出限额")
 		}
-		if int64(len(newIdArr)) > resp.Data.Num4 {
+		if int64(len(newIdArr)) > resp.Data.Num5 {
 			isExport = false
 			reason = append(reason, "超出您的数据导出总量限额")
 		}

JySEPlatform/util/utiltag.go

@@ -3,6 +3,7 @@ package util
 import (
 	"JySEPlatform/models"
 	sql "JySEPlatform/sqlmodel"
+	"app.yhyue.com/moapp/jybase/mongodb"
 	"context"
 	"encoding/json"
 	"errors"
@@ -223,46 +224,46 @@ func UtilEsFind1(tags map[string]interface{}) (error, int64) {
 						}
 					}
 					//匹配公告附件
-					//info, _ := MgoBidding.FindOne("bidding", bson.M{"_id": mongodb.StringTOBsonId(info_id)})
-					//if info != nil {
-					//	log.Println("匹配附件， id-", item["info_id"])
-					//	if (*info)["projectinfo"] != nil {
-					//		projectInfo := qu.ObjToMap((*info)["projectinfo"])
-					//		if projectInfo != nil && len(*projectInfo) > 0 {
-					//			if (*projectInfo)["attachments"] != nil {
-					//				filesArr := []map[string]interface{}{}
-					//				fileUrl := qu.ObjToString(Sysconfig["file_downloadurl"])
-					//				if attachments, oks := (*projectInfo)["attachments"].(map[string]interface{}); oks {
-					//					for _, v := range attachments {
-					//						if atta, ok := v.(map[string]interface{}); ok {
-					//							if atta["fid"] != nil && qu.ObjToString(atta["fid"]) != "" {
-					//								fileMap := map[string]interface{}{
-					//									"filename": atta["filename"],
-					//									"url":      fileUrl + qu.ObjToString(atta["fid"]),
-					//								}
-					//								filesArr = append(filesArr, fileMap)
-					//							} else {
-					//								if atta["org_url"] != nil {
-					//									fileMap := map[string]interface{}{
-					//										"filename": atta["filename"],
-					//										"url":      qu.ObjToString(atta["org_url"]),
-					//									}
-					//									filesArr = append(filesArr, fileMap)
-					//								}
-					//							}
-					//						}
-					//					}
-					//				}
-					//				log.Println("查询附件结果：", info_id, "附件数量：", len(filesArr))
-					//				if len(filesArr) > 0 {
-					//					item["filehref"] = filesArr
-					//				}
-					//			}
-					//		}
-					//	}
-					//} else {
-					//	log.Println("id", item["info_id"], "bidding为空")
-					//}
+					info, _ := MgoBidding.FindOne("bidding", bson.M{"_id": mongodb.StringTOBsonId(info_id)})
+					if info != nil {
+						log.Println("匹配附件， id-", item["info_id"])
+						if (*info)["projectinfo"] != nil {
+							projectInfo := qu.ObjToMap((*info)["projectinfo"])
+							if projectInfo != nil && len(*projectInfo) > 0 {
+								if (*projectInfo)["attachments"] != nil {
+									filesArr := []map[string]interface{}{}
+									fileUrl := qu.ObjToString(Sysconfig["file_downloadurl"])
+									if attachments, oks := (*projectInfo)["attachments"].(map[string]interface{}); oks {
+										for _, v := range attachments {
+											if atta, ok := v.(map[string]interface{}); ok {
+												if atta["fid"] != nil && qu.ObjToString(atta["fid"]) != "" {
+													fileMap := map[string]interface{}{
+														"filename": atta["filename"],
+														"url":      fileUrl + qu.ObjToString(atta["fid"]),
+													}
+													filesArr = append(filesArr, fileMap)
+												} else {
+													if atta["org_url"] != nil {
+														fileMap := map[string]interface{}{
+															"filename": atta["filename"],
+															"url":      qu.ObjToString(atta["org_url"]),
+														}
+														filesArr = append(filesArr, fileMap)
+													}
+												}
+											}
+										}
+									}
+									log.Println("查询附件结果：", info_id, "附件数量：", len(filesArr))
+									if len(filesArr) > 0 {
+										item["filehref"] = filesArr
+									}
+								}
+							}
+						}
+					} else {
+						log.Println("id", item["info_id"], "bidding为空")
+					}
 					//项目id
 					//projectId := GetProjectId(info_id)
 					//if projectId != "" {