Merge branch 'master' of http://192.168.3.207:8080/BaseService/jyMicroservices

jyBXBase/rpc/bxcollection/internal/logic/addlabellogic.go

@@ -47,7 +47,7 @@ func (l *AddlabelLogic) Addlabel(in *bxcol.AddlabelReq) (*bxcol.AddlabelRes, err
 		}, nil
 	}
 	//是否有重名
-	if labArr := *model.Mysql.SelectBySql(fmt.Sprintf("select * from %s where labelname = ? and userid = ?", "bdlabel"), in.Name, userid); len(labArr) == 1 {
+	if labArr := model.Mysql.SelectBySql(fmt.Sprintf("select * from %s where labelname = ? and userid = ?", "bdlabel"), in.Name, userid); labArr != nil && len(*labArr) == 1 {
 		return &bxcol.AddlabelRes{
 			ErrCode: -1,
 			ErrMsg:  "该标签已经存在",

jyBXBase/rpc/bxcollection/internal/logic/checksearchlogic.go

@@ -68,7 +68,6 @@ func (l *CheckSearchLogic) CheckSearch(in *bxcol.AddSearchReq) (res *bxcol.Commo
 	if model.Mgo.Count("search_condition", query) > 0 {
 		res.ErrCode = 1
 		res.ErrMsg = "该条件已保存，无需重复添加。"
-		return
 	}
 	return
 }

jyBXBase/rpc/bxcollection/internal/logic/getlabelactionlogic.go

@@ -44,8 +44,8 @@ func (l *GetLabelActionLogic) GetLabelAction(in *bxcol.GetLabelActionReq) (*bxco
 		}
 	}
 	data := []*bxcol.LabelByUser{}
-	if labArr := *model.Mysql.SelectBySql(fmt.Sprintf("select * from %s where  userid = ?", "bdlabel"), in.UserId); len(labArr) > 0 {
-		for _, v := range labArr {
+	if labArr := model.Mysql.SelectBySql(fmt.Sprintf("select * from %s where  userid = ?", "bdlabel"), in.UserId); labArr != nil && len(*labArr) > 0 {
+		for _, v := range *labArr {
 			l := bxcol.LabelByUser{}
 			lid := strconv.FormatInt(v["id"].(int64), 10)
 			l.Lid = se.SE.EncodeString(lid)

jyBXBase/rpc/bxcollection/internal/logic/iscollactionlogic.go

@@ -36,8 +36,8 @@ func (l *IsCollActionLogic) IsCollAction(in *bxcol.IsCollActionReq) (*bxcol.IsCo
 	var idata bxcol.IData
 	if in.Label != "" {
 		bid := util.DecodeId(strings.Split(in.Bids, ",")[0])
-		if bdinfos := *model.Mysql.SelectBySql(fmt.Sprintf("SELECT labelid FROM %s WHERE userid = ? AND bid = ?", "bdcollection"), in.UserId, bid); len(bdinfos) > 0 {
-			bdinfo := bdinfos[0]
+		if bdinfos := model.Mysql.SelectBySql(fmt.Sprintf("SELECT labelid FROM %s WHERE userid = ? AND bid = ?", "bdcollection"), in.UserId, bid); bdinfos != nil && len(*bdinfos) > 0 {
+			bdinfo := (*bdinfos)[0]
 			label_ids := common.ObjToString(bdinfo["labelid"])
 			//var labArr = []map[string]interface{}{}
 			var labArr []*bxcol.Labels
@@ -50,8 +50,8 @@ func (l *IsCollActionLogic) IsCollAction(in *bxcol.IsCollActionReq) (*bxcol.IsCo
 					}
 					label_ids_inter = append(label_ids_inter, id)
 				}
-				if labinfos := *model.Mysql.SelectBySql(fmt.Sprintf("SELECT * FROM %s WHERE id IN (%s)", "bdlabel", instatus), label_ids_inter...); len(labinfos) > 0 {
-					for _, v := range labinfos {
+				if labinfos := model.Mysql.SelectBySql(fmt.Sprintf("SELECT * FROM %s WHERE id IN (%s)", "bdlabel", instatus), label_ids_inter...); labinfos != nil && len(*labinfos) > 0 {
+					for _, v := range *labinfos {
 						lid := strconv.FormatInt(v["id"].(int64), 10)
 						lid_str := se.SE.EncodeString(lid)
 						labArr = append(labArr, &bxcol.Labels{
@@ -89,8 +89,8 @@ func (l *IsCollActionLogic) IsCollAction(in *bxcol.IsCollActionReq) (*bxcol.IsCo
 			collBidMap[v] = true
 		}
 	} else if collStatus == 2 { //大于100条 取mysql
-		if labArr := *model.Mysql.SelectBySql(fmt.Sprintf("select bid from %s where  userid = ?", "bdcollection"), in.UserId); len(labArr) > 0 {
-			for _, v := range labArr {
+		if labArr := model.Mysql.SelectBySql(fmt.Sprintf("select bid from %s where  userid = ?", "bdcollection"), in.UserId); labArr != nil && len(*labArr) > 0 {
+			for _, v := range *labArr {
 				bid_id := common.ObjToString(v["bid"])
 				collBidMap[bid_id] = true
 			}
@@ -103,7 +103,7 @@ func (l *IsCollActionLogic) IsCollAction(in *bxcol.IsCollActionReq) (*bxcol.IsCo
 	}
 
 	if in.Bids == "" {
-		for k, _ := range collBidMap {
+		for k := range collBidMap {
 			res = append(res, k)
 		}
 	} else {

jyBXBase/rpc/bxcollection/internal/logic/labelactionlogic.go

@@ -80,8 +80,8 @@ func (l *LabelActionLogic) LabelAction(in *bxcol.LabelActionReq) (*bxcol.LabelAc
 		//标签名称不为空  标签id为空 == 新增标签；如果bids 收藏的招标信息id不为空则再进行绑定
 		if in.Lname != "" && in.Lids == "" {
 			//是否有重名
-			if labArr := *model.Mysql.SelectBySql(fmt.Sprintf("select * from %s where labelname = ? and userid = ?", "bdlabel"), in.Lname, in.UserId); len(labArr) == 1 {
-				res := labArr[0]
+			if labArr := model.Mysql.SelectBySql(fmt.Sprintf("select * from %s where labelname = ? and userid = ?", "bdlabel"), in.Lname, in.UserId); labArr != nil && len(*labArr) == 1 {
+				res := (*labArr)[0]
 				in.Lids = se.SE.EncodeString(common.ObjToString(res["id"]))
 				ibool = true
 			} else { //新增标签