Merge branch 'crm1.0' into debug

controllers/contract.go

@@ -21,7 +21,7 @@ type ContractCommon struct {
 // @Description 上传签回附件接口
 // @Param	request	body contract.UploadCheckBackFileReq true "type json string"
 // @Success Ret=200 上传成功
-// @router /upload_check_back_file [get]
+// @router /upload_check_back_file [post]
 func (this *ContractCommon) UploadCheckBackFile() {
 	var req contractReq.UploadCheckBackFileReq
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)

models/tables/contract_approval/contract_approval.go

@@ -495,7 +495,7 @@ c.seal_type,c.company_name,c.user_id,c.user_name,c.file_url,c.code from contract
 	sql += childCondition
 	sql += `  GROUP BY contract_id ) b on a.contract_approval_id=b.max_id
 	JOIN seal c ON c.seal_id = a.contract_id 
-	JOIN contract_approval_record d on a.contract_approval_id=d.contract_approval_id
+	JOIN contract_approval_record d on a.contract_approval_id=d.contract_approval_id and a.curr_node_id=d.node_id
 WHERE c.is_delete = 0 AND a.approval_type="seal" `
 	sql += condition
 	sql += ` group by contract_id order by modify_time desc LIMIT ?,? `