Merge branch 'dev/v1.1.20_fuwencai' of http://192.168.3.207:8080/BaseService/jyMicroservices into dev/v1.1.20_fuwencai

jyBXCore/rpc/internal/logic/participaterecordslogic.go

@@ -3,7 +3,6 @@ package logic
 import (
 	"app.yhyue.com/moapp/jybase/common"
 	"context"
-	"fmt"
 	"jyBXCore/rpc/internal/svc"
 	"jyBXCore/rpc/model/es"
 	"jyBXCore/rpc/service"
@@ -53,7 +52,8 @@ func (l *ParticipateRecordsLogic) ParticipateRecords(in *bxcore.ParticipateRecor
 	// 验证身份
 	projectId := common.ObjToString((*projectInfos)[0]["_id"])
 	if !participateService.CheckBidPower(projectId, false) {
-		return result, fmt.Errorf("没有该项目操作记录查看权限")
+		result.ErrMsg = "没有查看权限"
+		return result, nil
 	}
 	//  查询
 	data := participateService.GetBidRecords(projectId, in.Page, in.PageSize)

jyBXCore/rpc/service/participate.go

@@ -179,7 +179,7 @@ func GetParticipateSetInfo(in *bxcore.ParticipateSetUpInfoReq) (*bxcore.Particip
 			//查询对应用户设置信息
 			//未设置过 返回默认配置
 			if info, err := mysql.GetParticipateSetInfo(in); err == nil {
-				info.IsShow = MC.If(entRoleId == 1, entRoleId, -1).(int64)
+				info.IsShow = MC.If(entRoleId == 1, entRoleId, int64(-1)).(int64)
 				res.Data = info
 			} else {
 				res.ErrCode = -1

jyBXCore/rpc/service/participateBid.go

@@ -131,8 +131,6 @@ func (p *ParticipateBid) DetailEntFormat(existProjectMap map[string]string, isVa
 		formatData.ShowParticipate = true
 		return
 	}
-	formatData.CurrentTime = time.Now().Unix()
-	formatData.BidEndTime = bidEndTime
 	persons := ""
 	for _, v := range existProjectMap { // 这是为了取参标人id信息 列表页是多条数据 详情页这里 map里面只会有一条数据
 		persons = v
@@ -146,6 +144,8 @@ func (p *ParticipateBid) DetailEntFormat(existProjectMap map[string]string, isVa
 	if !isValid {
 		return
 	}
+	formatData.CurrentTime = time.Now().Unix()
+	formatData.BidEndTime = bidEndTime
 	// 如果是管理员 显示 终止参标按钮、转给同事按钮
 	if p.EntRoleId == RoleEntManager || p.EntRoleId == RoleDepartManager {
 		formatData.ShowStopParticipate = true
@@ -335,7 +335,7 @@ func (p *ParticipateBid) GetLastBidStatus(projectId string) (map[string]interfac
 
 }
 func (p ParticipateBid) ParticipateContentFormat(data map[string]interface{}) (rs bxcore.ParticipateContentData) {
-	if data == nil {
+	if len(data) == 0 {
 		return
 	}
 	rs.BidType = common.Int64All(data["bidType"])