fix 客户审批

controllers/approval_new.go

@@ -487,6 +487,10 @@ func (c *ApprovalCommon) ApplyApprove() {
 	//CompanyApprovalId
 	//数据校验（校验是否具有审批权限）
 	_, _, approvalRecord, err := company_apply.CheckApproveAuth(req.CompanyId, approvalItem.ProductId, sysUser)
+	if err != nil {
+		c.FailWithMessage("审核失败！", "审核失败，Err:"+err.Error())
+		return
+	}
 	//真实审核操作
 	if req.Status == 1 {
 		err = company_apply.Approved(approvalRecord, sysUser, req.Remark)

models/tables/company_approval/company_approval.go

@@ -61,7 +61,7 @@ func GetCompanyApprovalCountById(companyId, productId int) (count int, err error
 
 // GetCompanyApprovalByCompanyId 根据客户编号、产品编号获取客户单
 func GetCompanyApprovalByCompanyId(companyId, productId int) (item *CompanyApproval, err error) {
-	sql := `SELECT * FROM company_approval WHERE company_id=? AND product_id=? AND approve_status='待审批' LIMIT 1 `
+	sql := `SELECT * FROM company_approval WHERE company_id=? AND product_id=? AND approve_status='待审批' order by company_approval_id desc LIMIT 1 `
 	o := orm.NewOrm()
 	err = o.Raw(sql, companyId, productId).QueryRow(&item)
 	return