Browse Source

fix:兼容处理ubuntu中libreoffice对于空格的处理

Roc 3 years ago
parent
commit
1de038cf3f
2 changed files with 2 additions and 5 deletions
  1. 1 1
      services/contract/contract_approval.go
  2. 1 4
      services/word.go

+ 1 - 1
services/contract/contract_approval.go

@@ -718,7 +718,7 @@ func AfterApproved(contractId int) (err error) {
 
 		//生成word
 		wordPath := fmt.Sprint("./static/系统生成合同_", contractDetail.ContractId, ".docx")
-		tmpErr := services.GenerateWordV2(contractDetail, wordPath, true)
+		tmpErr := services.GenerateWordV2(contractDetail, wordPath)
 		if tmpErr != nil {
 			err = tmpErr
 			return

+ 1 - 4
services/word.go

@@ -1079,7 +1079,7 @@ type WordElement struct {
 }
 
 // GenerateWordV2 生成word
-func GenerateWordV2(contractDetail *contract.ContractDetail, wordPath string, isWordToPdf bool) (err error) {
+func GenerateWordV2(contractDetail *contract.ContractDetail, wordPath string) (err error) {
 	contractTemplate, err := contract_template.GetContractTemplateByTemplateId(contractDetail.TemplateId)
 	if err != nil {
 		return
@@ -1447,9 +1447,6 @@ func GenerateWordV2(contractDetail *contract.ContractDetail, wordPath string, is
 					for j := 0; j < addTabNum; j++ {
 						//headerRun.AddTab()
 						tabStr := "  "
-						if isWordToPdf && utils.RunMode == "release" {
-							tabStr = "   "
-						}
 						printContent = tabStr + printContent
 					}
 				}