Merge branch 'crm/8.8' into debug

services/contract/contract.go

@@ -488,6 +488,7 @@ func EquityMergeSubjectAndObject(serviceList []*contractCustom.ContractServiceAn
 	// 遍历原服务
 	serviceLen := len(serviceList)
 	if serviceLen > 0 {
+		otherList := make([]*contractCustom.ContractServiceAndDetail, 0)
 		needCheck := make([]*contractCustom.ContractServiceAndDetail, 0)
 		for i := 0; i < serviceLen; i++ {
 			sv := serviceList[i]
@@ -500,7 +501,8 @@ func EquityMergeSubjectAndObject(serviceList []*contractCustom.ContractServiceAn
 				needCheck = append(needCheck, sv)
 			} else {
 				if !strings.Contains(sv.Title, "主观") && !strings.Contains(sv.Title, "客观") {
-					mergeList = append(mergeList, sv)
+					otherList = append(otherList, sv)
+					//mergeList = append(mergeList, sv)
 				}
 			}
 		}
@@ -532,6 +534,7 @@ func EquityMergeSubjectAndObject(serviceList []*contractCustom.ContractServiceAn
 				mergeList = append(mergeList, parent)
 			}
 		}
+		mergeList = append(mergeList, otherList...)
 	}
 	return
 }