pdf生成时，省为直辖市的时候，不展示省信息

services/word.go

@@ -121,7 +121,7 @@ func GenerateWord(contractDetail *contract.ContractDetail) (err error) {
 				// ClearContent clears both text and line breaks within a run,
 				// so we need to add the line break back
 				r.ClearContent()
-				address := contractDetail.Province + contractDetail.City + contractDetail.Address
+				address := getContractAddress(contractDetail)
 				r.AddText(address)
 				//r.AddBreak()
 
@@ -529,7 +529,7 @@ func GetHtmlByContractDetail(contractDetail *contract.ContractDetail, htmlType s
 	myTpl := template.Must(template.New("contract").Parse(htmlTpl))
 
 	//地址
-	address := contractDetail.Province + contractDetail.City + contractDetail.Address
+	address := getContractAddress(contractDetail)
 	data := html2pdfData{
 		CompanyName:     contractDetail.CompanyName,
 		ContractCode:    contractDetail.ContractCode,
@@ -1055,3 +1055,14 @@ func getColList(item *contract_service_detail.ContractServiceDetail) (cellList [
 	}
 	return
 }
+
+// getContractAddress 获取展示的详细地址
+func getContractAddress(contractDetail *contract.ContractDetail) (address string) {
+	ignoreStrs := []string{"北京市", "上海市", "天津市", "重庆市"}
+	if strings.Contains(strings.Join(ignoreStrs, ","), contractDetail.Province) {
+		address = contractDetail.City + contractDetail.Address
+	} else {
+		address = contractDetail.Province + contractDetail.City + contractDetail.Address
+	}
+	return
+}