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

jyBXCore/api/etc/bxcore-api.yaml

@@ -17,7 +17,6 @@ Core:
 AppId: 10000
 MgoLogsName: jybxcore_logs
 MgoLogsCount: 500
-
 DetailMosaicTxt: 略
 SearchMosaic:
   budget: true

jyBXCore/rpc/model/mysql/participateBid.go

@@ -595,14 +595,20 @@ func ParticipateListSql(in *bxcore.ParticipateListReq) string {
 	}
 	//参标人  管理员权限
 	if in.EntUserIds != "" && in.PositionType > 0 {
-		conditionSql += ` AND  (`
+		var entUserIdsSql = ""
 		for k, v := range strings.Split(in.EntUserIds, ",") {
-			if k > 0 {
-				conditionSql += " OR "
+			v = encrypt.SE.Decode4HexByCheck(v)
+			if v == "" {
+				continue
+			}
+			if k > 0 && entUserIdsSql != "" {
+				entUserIdsSql += " OR "
 			}
-			conditionSql += ` FIND_IN_SET(` + v + ` , pug.ent_user_id) `
+			entUserIdsSql += ` FIND_IN_SET(` + v + ` , pug.ent_user_id) `
+		}
+		if entUserIdsSql != "" {
+			conditionSql += ` AND  (` + entUserIdsSql + `)`
 		}
-		conditionSql += `)`
 	}
 	//默认按照投标截止日期正序排列、1：开标时间正序、2：更新状态时间倒序
 	//投标结束时间和开标时间 很多项目数据没有这两个字段值

jyBXCore/rpc/service/participate.go

@@ -156,7 +156,7 @@ func GetParticipateSetInfo(in *bxcore.ParticipateSetUpInfoReq) (*bxcore.Particip
 		RemindRule: nil,
 	}}
 	b, entRoleId := util.IsAllowedParticipate(in.AppId, in.UserId, in.NewUserId, in.AccountId, in.EntAccountId, in.EntId, in.EntUserId, in.PositionId, in.PositionType)
-	if !b {
+	if !b || entRoleId == 0 {
 		res.ErrMsg = "没有权限"
 		res.Data = nil
 		res.ErrCode = -1

jyBXCore/test.http

@@ -229,3 +229,18 @@ accountId: 360157
 {
   "sid":"ABCY2FddTxYLyo4And1c08ODCcoGjF0XGB%2BKDggPSFFYFJwGC9UCa0%3D"
 }
+
+###  获取最新的投标状态信息
+GRPC http://127.0.0.1:8003/bxcore.BxCore/ParticipateSetUpInfo
+
+{
+  "entId": 0,
+  "entUserId": 0,
+  "positionId": 1204781659,
+  "positionType": 0,
+  "mgoUserId": "641aa7bcac1c8e639bc15cdb",
+  "appId": 10000,
+  "userId": "641aa7bcac1c8e639bc15cdb",
+  "newUserId": 486050,
+  "accountId": 360058
+}