소스 검색

fix:用印/合同审批 处理中数据修复

Roc 3 년 전
부모
커밋
11513e73cc
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      controllers/contract_approval.go
  2. 1 1
      controllers/seal_approval.go

+ 1 - 1
controllers/contract_approval.go

@@ -66,7 +66,7 @@ func (this *ContractApprovalCommon) List() {
 	if status == "待审批" {
 		condition += ` AND ((c.seller_id = ? and a.start_node_id = a.curr_node_id) OR (d.approve_user_id = ? )) and d.status="待审批" `
 	} else if status == "处理中" {
-		condition += ` AND ((c.seller_id = ? and a.start_node_id != a.curr_node_id) OR (d.approve_user_id = ? )) and d.status="待审批" `
+		condition += ` AND ((c.seller_id = ? and a.start_node_id != a.curr_node_id) OR (d.approve_user_id = ? )) and c.status="待审批" `
 		joinCondition = " and a.curr_node_id!=d.node_id"
 	} else {
 		condition += ` AND (c.seller_id = ? or d.approve_user_id = ?)`

+ 1 - 1
controllers/seal_approval.go

@@ -72,7 +72,7 @@ func (this *SealApprovalCommon) List() {
 		//condition += ` AND (c.user_id = ?  OR d.approve_user_id = ?) and (d.approve_user_id is null or d.approve_user_id = c.user_id)`
 
 	} else if status == "处理中" {
-		condition += ` AND ((c.user_id = ? and a.start_node_id != a.curr_node_id) OR (d.approve_user_id = ? )) and d.status="待审批" `
+		condition += ` AND ((c.user_id = ? and a.start_node_id != a.curr_node_id) OR (d.approve_user_id = ? )) and c.status="待审批" `
 		joinCondition = " and a.curr_node_id!=d.node_id"
 	} else {
 		condition += ` AND (c.user_id = ? or d.approve_user_id = ?)`