Merge branch 'develop' of http://code.dashoo.cn/dashoo/supplier_system into develop

src/dashoo.cn/backend/api/controllers/oilsupplier/annualaudit.go

@@ -889,7 +889,7 @@ func (this *AnnualAuditController) CompanyAuditEntity() {
 	supplierLogService.SaveSupplierLogForAnnual(annualEntity.SupplierId, sourceId) // 年审
 }
 
-// @Title 二级分办单位提交审批
+// @Title 二级单位分办提交审批
 // @Description 提交审批
 // @Success	200	{object} controllers.Request
 // @router /unit-audit/:id [post]
@@ -921,6 +921,10 @@ func (this *AnnualAuditController) SeparateUnitSubmitAuditEntity() {
 		}
 	}()
 
+	if firstAudit == "" || secondAudit == "" {
+		panic("请选择审批人")
+	}
+
 	svc := annualaudit.GetOilAnnualAuditService(utils.DBE)
 	var auditEntity annualaudit.OilAnnualAudit
 	svc.GetEntityById(annualId, &auditEntity)
@@ -1013,6 +1017,9 @@ func (this *AnnualAuditController) SeparateAuditEntity() {
 	var annualEntity annualaudit.OilAnnualAudit
 	srv.GetEntityById(annualId, &annualEntity)
 	if Result == "1" {
+		if firstAudit == "" || secondAudit == "" {
+			panic("请选择审批人")
+		}
 		// 将选择的初审和复审人员保存下来
 		cols := []string{
 			"FirstAudit",

src/dashoo.cn/backend/api/controllers/oilsupplier/infochange.go

@@ -1680,6 +1680,10 @@ func (this *InfoChangeController) UnitAuditEntity() {
 		}
 	}()
 
+	if firstAudit == "" || secondAudit == "" {
+		panic("请选择审批人")
+	}
+
 	//取出准入表信息
 	svc := infochange.GetInfoChangeService(utils.DBE)
 	var infoChangeEntity infochange.OilInfoChange
@@ -1776,6 +1780,9 @@ func (this *InfoChangeController) SeparateAuditEntity() {
 	var infoChangeEntity infochange.OilInfoChange
 	infoSrv.GetEntityById(infoId, &infoChangeEntity)
 	if Result == "1" {
+		if firstAudit == "" || secondAudit == "" {
+			panic("请选择审批人")
+		}
 		// 将选择的初审和复审人员保存下来
 		cols := []string{
 			"FirstAudit",

src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercert.go

@@ -864,15 +864,14 @@ func (this *OilSupplierCertController) SeparateAuditEntity() {
 		}
 	}()
 
-	if firstAudit == "" || secondAudit == "" {
-		panic("请选择审批人")
-	}
-
 	// 取出准入表信息
 	certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
 	var supplierCertEntity suppliercert.OilSupplierCert
 	certSrv.GetEntityById(certId, &supplierCertEntity)
 	if Result == "1" {
+		if firstAudit == "" || secondAudit == "" {
+			panic("请选择审批人")
+		}
 		// 将选择的初审和复审人员保存下来
 		cols := []string{
 			"FirstAudit",

src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercertappend.go

@@ -810,6 +810,10 @@ func (this *OilSupplierCertAppendController) SeparateUnitSubmitAuditEntity() {
 		}
 	}()
 
+	if firstAudit == "" || secondAudit == "" {
+		panic("请选择审批人")
+	}
+
 	certSrv := suppliercertappend.GetOilSupplierCertAppendService(utils.DBE)
 	var supplierCertAppendEntity suppliercertappend.OilSupplierCertAppend
 	certSrv.GetEntityById(certAppendId, &supplierCertAppendEntity)
@@ -904,6 +908,10 @@ func (this *OilSupplierCertAppendController) AppendSeparateAuditEntity() {
 	var supplierCertAppendEntity suppliercertappend.OilSupplierCertAppend
 	certSrv.GetEntityById(certAppendId, &supplierCertAppendEntity)
 	if Result == "1" {
+		if firstAudit == "" || secondAudit == "" {
+			panic("请选择审批人")
+		}
+
 		// 将选择的初审和复审人员保存下来
 		cols := []string{
 			"FirstAudit",