Browse Source

no message

zhangchuanxing 2 months ago
parent
commit
ec41446b42
1 changed files with 17 additions and 14 deletions
  1. 17 14
      controllers/seal/seal_approval.go

+ 17 - 14
controllers/seal/seal_approval.go

@@ -464,25 +464,19 @@ func (this *SealApprovalController) Apply() {
 		br.ErrMsg = "参数解析异常!Err:" + err.Error()
 		return
 	}
+	creditCode := req.CreditCode
+	startDate := req.StartDate
+
 	reqVerify := utils.Rules{
-		"Use":               {utils.NotEmpty()},
-		"CompanyName":       {utils.NotEmpty()},
-		"CreditCode":        {utils.NotEmpty()},
-		"ServiceType":       {utils.NotEmpty()},
-		"SealType":          {utils.NotEmpty()},
+		"Use":         {utils.NotEmpty()},
+		"CompanyName": {utils.NotEmpty()},
+		"CreditCode":  {utils.NotEmpty()},
+		"ServiceType": {utils.NotEmpty()},
+		//"SealType":          {utils.NotEmpty()}, //权益非标合同不校验合同类型
 		"FileUrls":          {utils.NotEmpty()},
 		"AffiliatedCompany": {utils.NotEmpty()},
 	}
 
-	err = utils.Verify(req, reqVerify, utils.LANG_CN)
-	if err != nil {
-		br.Msg = "参数丢失!"
-		br.ErrMsg = "参数丢失!Err:" + err.Error()
-		return
-	}
-	creditCode := req.CreditCode
-	startDate := req.StartDate
-
 	if startDate != "" {
 		companyInfo, tmpErr := company.GetCompanyByCreditCode(creditCode)
 		//如果查询异常,且并不是在系统中找不到该社会信用码,那么就异常返回
@@ -492,6 +486,15 @@ func (this *SealApprovalController) Apply() {
 			return
 		}
 		req.CompanyId = companyInfo.CompanyId
+	} else {
+		reqVerify["SealType"] = []string{utils.NotEmpty()}
+	}
+
+	err = utils.Verify(req, reqVerify, utils.LANG_CN)
+	if err != nil {
+		br.Msg = "参数丢失!"
+		br.ErrMsg = "参数丢失!Err:" + err.Error()
+		return
 	}
 
 	// 申请用印