no message

controllers/company_apply_v2.go

@@ -716,36 +716,8 @@ func (this *CompanyApplyController) ApplyTurnPositive() {
 			br.ErrMsg = "生成合同编码失败,Err:" + err.Error()
 			return
 		}
-		//如果是权益的合同,合同编号另 取
 
-		//if productId == 2 {
-		//	sealCount, err := seal.GetCountByDateAndCompanyId(req.StartDate, req.EndDate, req.CompanyId)
-		//	if err != nil {
-		//		br.Msg = "生成合同编码失败"
-		//		br.ErrMsg = "获取用印合同数量信息失败,Err:" + err.Error()
-		//		return
-		//	}
-		//	crmConfig, err := company.GetConfigDetailByCode("rai_seal_check") //权益非标合同是否校验用印提交
-		//	if err != nil {
-		//		br.Msg = "获取配置失败"
-		//		br.ErrMsg = "获取配置失败,Err:" + err.Error()
-		//		return
-		//	}
-		//
-		//	if sealCount == 0 && crmConfig.ConfigValue == "1" {
-		//		br.Msg = "此合同暂未申请用印，请核对合同期限是否有误"
-		//		return
-		//	}
-		//	if sealCount > 0 {
-		//		sealInfo, err := seal.GetSealInfoByDateAndCompanyId(req.StartDate, req.EndDate, req.CompanyId)
-		//		if err != nil {
-		//			br.Msg = "生成合同编码失败"
-		//			br.ErrMsg = "获取用印合同信息失败,Err:" + err.Error()
-		//			return
-		//		}
-		//		contractCode = sealInfo.Code
-		//	}
-		//}
+		//如果是权益的合同,合同编号另 取
 
 		var sealId int
 
@@ -784,7 +756,6 @@ func (this *CompanyApplyController) ApplyTurnPositive() {
 				sealId = sealInfo.SealId
 			}
 		}
-
 		//当前是否存在待审批的单子
 		nowCompanyApprovalInfo, err := company.GetCompanyApprovalById(req.CompanyId, productId)
 		if (err == nil || nowCompanyApprovalInfo != nil) || err != nil && err.Error() != utils.ErrNoRow() {

controllers/roadshow/report.go

@@ -781,7 +781,7 @@ func (this *CalendarController) ReportCalendarList() {
 		pars = append(pars, 1)
 	}
 
-	if englishCompany > 0 {
+	if englishCompany != -1 {
 		condition += ` and b.english_company = ? `
 		pars = append(pars, englishCompany)
 	}