Merge branch 'dev/v1.1.20_fuwencai' of BaseService/jyMicroservices into feature/v1.1.20

jyBXCore/rpc/model/mysql/participateBid.go

@@ -707,7 +707,7 @@ func AdminParticipateList(in *bxcore.ParticipateListReq, conditionSql string) (d
 	stateSql := ``
 	if in.EntUserIds == "" {
 		//maxStateSql = `,MAX(pu.state) state`
-		stateSql = `AND NOT EXISTS ( SELECT 1 FROM ` + ParticipateUserTable + ` WHERE project_id = pu.project_id AND state > pu. state )`
+		stateSql = `AND NOT EXISTS ( SELECT 1 FROM ` + ParticipateUserTable + ` ppu WHERE ppu.project_id = pu.project_id AND ppu.ent_id = pu.ent_id AND ppu.state > pu.state )`
 	}
 	adminSql = fmt.Sprintf(adminSql, "%s", stateSql)
 	adminCountSql := fmt.Sprintf(adminSql, "COUNT(pt.id)") + conditionSql

jyBXCore/rpc/service/participate.go

@@ -142,7 +142,7 @@ func ParticipateDo(in *bxcore.ParticipateActionReq) error {
 			}
 			projectNum += 1
 		}
-		if projectNum != len(projectIds) {
+		if projectNum == 0 { //!= len(projectIds)
 			return fmt.Errorf("划转失败")
 		}
 	}