Merge branch 'master' of http://192.168.1.41:3000/caipin/construction_management

services/rule_service.go

@@ -57,7 +57,6 @@ func (s *ruleService) Post(pid int, id int, key string, value string) error {
 
 // 生成code
 func (s *ruleService) AutoCode(bid int, pid int, codeType string) (string, error) {
-	fmt.Println("codeType---------------------------------------", codeType)
 	// 获取该标段的规则
 	rule := s.daoRule.FindByPidWithBid(pid, bid)
 	if codeType == "safeRule" {
@@ -110,7 +109,7 @@ func (s *ruleService) AutoCode(bid int, pid int, codeType string) (string, error
 			return string(e), err
 		}
 	} else if codeType == "contractPaidRule" {
-		if rule.ContractReturnRule == "" {
+		if rule.ContractPaidRule == "" {
 			return "", errors.New("该标段未设置编号规则!")
 		}
 		var code viewmodels.RuleCode