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

src/dashoo.cn/backend/api/controllers/oilcontract/contractReview.go

@@ -855,7 +855,7 @@ func (this *OilContractReviewController) UnitAuditEntity() {
 		}
 	}()
 
-	if Id == "" || firstAudit == "" || secondAudit == "" || baseUserInfo.UnitId == 0{
+	if Id == "" || firstAudit == "" || secondAudit == "" || baseUserInfo.UnitId == 0 {
 		panic("请求信息不完整")
 	}
 
@@ -977,6 +977,14 @@ func (this *OilContractReviewController) CommonAuditEntity() {
 		var contractReviewEntity contractReview.OilContractReview
 		conRev.GetEntityById(Ids[i], &contractReviewEntity)
 
+		if contractReviewEntity.Status == "1" && contractReviewEntity.SecondAudit == 0 {
+			panic("二级单位复审人不存在，请联系系统管理员！")
+		}
+
+		if contractReviewEntity.Status == "2" && contractReviewEntity.ThirdAudit == 0 {
+			panic("专业处室不存在，请联系系统管理员！")
+		}
+
 		svcActiviti := workflow.GetActivitiService(utils.DBE)
 		var ActiComplete workflow.ActiCompleteVM
 		if contractReviewEntity.IsBusiness == 1 {