合约明细修改

@@ -298,6 +298,7 @@ func (ptr *CooperationStatisticsService) GetContractDividends(queryOptions map[s
 	// 2.合约分红列表
 	// 2.合约分红列表
 	creditAccountRepository, _ := repository.NewDividendsEstimateRepository(ptr.transactionContext)
 	creditAccountRepository, _ := repository.NewDividendsEstimateRepository(ptr.transactionContext)
 	queryOptions["cooperationContractNumber"] = contract.CooperationContractNumber
 	queryOptions["cooperationContractNumber"] = contract.CooperationContractNumber
+	queryOptions["orgId"] = contract.Org.OrgId
 	_, creditAccounts, err := creditAccountRepository.Find(queryOptions)
 	_, creditAccounts, err := creditAccountRepository.Find(queryOptions)
 	if err != nil {
 	if err != nil {
 		return res, err
 		return res, err
@@ -542,7 +543,9 @@ func (ptr *CooperationStatisticsService) SearchDividendsEstimates(queryOptions m
 			DividendsType:            item.DividendsType,
 			DividendsType:            item.DividendsType,
 			DividendsUser:            item.DividendsUser,
 			DividendsUser:            item.DividendsUser,
 		}
 		}
-		if item.PaymentStatus == 2 {
+		// 1.全部列表、已支付列表的分红状态显示为已分红
+		// 2.已结算列表的分红状态还是显示已结算
+		if item.PaymentStatus == 2 && (request.DividendsAccountStatus == 3 || request.DividendsAccountStatus == 0) {
 			result.DividendsAccountStatus = 3
 			result.DividendsAccountStatus = 3
 		}
 		}
 		// TODO:优化查询 统一查询到map里面、或者冗余数据
 		// TODO:优化查询 统一查询到map里面、或者冗余数据