Merge branch 'crm1.0' into debug

models/tables/contract_approval/contract_approval.go

@@ -278,7 +278,7 @@ func (ContractApproval) Reject(contractApprovalInfo *ContractApproval, contractA
 		_, err = o.Raw(sql, remark, contractApprovalInfo.ContractId).Exec()
 	case "seal":
 		//修改用印状态为已驳回
-		sql := `UPDATE seal SET status="已驳回",approval_remark=?,modify_time=NOW() WHERE contract_id = ?`
+		sql := `UPDATE seal SET status="已驳回",approval_remark=?,modify_time=NOW() WHERE seal_id = ?`
 		_, err = o.Raw(sql, remark, contractApprovalInfo.ContractId).Exec()
 	}
 	return
@@ -337,7 +337,7 @@ func (ContractApproval) Approved(contractApprovalInfo *ContractApproval, contrac
 			}
 		case "seal":
 			//修改用印状态为已审批
-			sql := `UPDATE seal SET status="已审批",approval_remark=?,modify_time=NOW() WHERE contract_id = ?`
+			sql := `UPDATE seal SET status="已审批",approval_remark=?,modify_time=NOW() WHERE seal_id = ?`
 			_, tmpErr = o.Raw(sql, remark, contractApprovalInfo.ContractId).Exec()
 			if tmpErr != nil {
 				err = tmpErr

services/seal/approval.go

@@ -289,7 +289,7 @@ func Reject(sealInfo *seal.Seal, approvalInfo *contract_approval.ContractApprova
 	{
 		content := sealInfo.CompanyName + " 用印已驳回"
 		approvalSysUser, _ := admin.GetAdminById(sealInfo.UserId)
-		go services.AddCompanyApprovalMessage(opUserId, sealInfo.UserId, 0, approvalRecord.ContractApprovalRecordId, 2, 2, 3, sealInfo.CompanyName, content, content, approvalSysUser.Mobile)
+		go services.AddCompanyApprovalMessage(opUserId, sealInfo.UserId, 0, approvalRecord.ContractApprovalRecordId, 2, sourceType, 3, sealInfo.CompanyName, content, content, approvalSysUser.Mobile)
 
 		//发送消息给所有的抄送人
 		//go messageToAllCcUser(opUserId, approvalRecord.ContractApprovalId, 2, 3, sealInfo.CompanyName, content)
@@ -359,7 +359,7 @@ func Approved(sealInfo *seal.Seal, approvalInfo *contract_approval.ContractAppro
 		{
 			content := sealInfo.CompanyName + " 用印已审核"
 			approvalSysUser, _ := admin.GetAdminById(sealInfo.UserId)
-			go services.AddCompanyApprovalMessage(opUserId, sealInfo.UserId, 0, approvalRecord.ContractApprovalRecordId, 2, 2, 2, sealInfo.CompanyName, content, content, approvalSysUser.Mobile)
+			go services.AddCompanyApprovalMessage(opUserId, sealInfo.UserId, 0, approvalRecord.ContractApprovalRecordId, 2, sourceType, 2, sealInfo.CompanyName, content, content, approvalSysUser.Mobile)
 		}
 	} else {
 		//获取下级节点信息