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

jyBXCore/rpc/service/participateStatistics.go

@@ -738,8 +738,7 @@ func GetDetailQuery(isEnt bool, personArrStr string, req *bxcore.ProjectDetailsR
 			sourceArr := []string{}
 			for i := 0; i < len(req.Source); i++ {
 				if req.Source[i] == 0 {
-					sourceArr = append(sourceArr, fmt.Sprintf(" FIND_IN_SET('%d', a.source)", 1))
-					sourceArr = append(sourceArr, fmt.Sprintf(" FIND_IN_SET('%d', a.source)", 2))
+					sourceArr = append(sourceArr, "NOT FIND_IN_SET('3', a.source)")
 				} else {
 					sourceArr = append(sourceArr, fmt.Sprintf(" FIND_IN_SET('%d', a.source)", req.Source[i]))
 				}
@@ -830,8 +829,7 @@ func GetDetailQuery(isEnt bool, personArrStr string, req *bxcore.ProjectDetailsR
 			sourceArr := []string{}
 			for i := 0; i < len(req.Source); i++ {
 				if req.Source[i] == 0 {
-					sourceArr = append(sourceArr, fmt.Sprintf(" FIND_IN_SET('%d', a.source)", 1))
-					sourceArr = append(sourceArr, fmt.Sprintf(" FIND_IN_SET('%d', a.source)", 2))
+					sourceArr = append(sourceArr, "NOT FIND_IN_SET('3', a.source)")
 				} else {
 					sourceArr = append(sourceArr, fmt.Sprintf(" FIND_IN_SET('%d', a.source)", req.Source[i]))
 				}