fix 审批列表数据调整

controllers/approval_new.go

@@ -47,15 +47,18 @@ func (c *ApprovalCommon) ListV2() {
 	//join表字段
 	//归属
 	if status == "待审批" {
-		condition += ` AND ((c.apply_user_id = ? and a.start_node_id = a.curr_node_id) OR (d.approve_user_id = ? )) and d.approve_status="待审批" `
-		//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)`
+		condition += ` AND ( (((c.apply_user_id = ? and a.start_node_id = a.curr_node_id) OR (d.approve_user_id = ? and a.curr_node_id=d.node_id )) and d.approve_status="待审批" or (d.approve_user_id = ? and a.curr_node_id > d.node_id and d.node_type="cc") )`
+		//condition += ` AND ((c.apply_user_id = ? and a.start_node_id = a.curr_node_id) OR (d.approve_user_id = ? )) and d.approve_status="待审批" `
 
+		pars = append(pars, sysUser.AdminId, sysUser.AdminId, sysUser.AdminId)
 	} else if status == "处理中" {
-		condition += ` AND ((c.apply_user_id = ? and a.start_node_id != a.curr_node_id) OR (d.approve_user_id = ? )) and c.approve_status="待审批" `
+		condition += ` AND ((c.apply_user_id = ? and a.start_node_id != a.curr_node_id) OR (d.approve_user_id = ? and a.curr_node_id > d.node_id and d.node_type!="cc")) and c.approve_status="待审批" `
+
+		pars = append(pars, sysUser.AdminId, sysUser.AdminId)
 	} else {
 		condition += ` AND (c.apply_user_id = ? or d.approve_user_id = ?)`
+		pars = append(pars, sysUser.AdminId, sysUser.AdminId)
 	}
-	pars = append(pars, sysUser.AdminId, sysUser.AdminId)
 
 	//审批状态
 	if status != "" {

controllers/contract_approval.go

@@ -67,14 +67,18 @@ func (c *ContractApprovalCommon) List() {
 	joinCondition := " and a.curr_node_id=d.node_id"
 	//归属
 	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 a.curr_node_id=d.node_id)) and d.status="待审批") or (d.approve_user_id = ? and a.curr_node_id > d.node_id and d.node_type="cc") ) `
+
+		joinCondition = ``
+		pars = append(pars, sysUser.AdminId, sysUser.AdminId, sysUser.AdminId)
 	} else if status == "处理中" {
-		condition += ` AND ((c.seller_id = ? and a.start_node_id != a.curr_node_id) OR (d.approve_user_id = ? )) and c.status="待审批" `
+		condition += ` AND ((c.seller_id = ? and a.start_node_id != a.curr_node_id) OR (d.approve_user_id = ?  and a.curr_node_id > d.node_id and d.node_type!="cc")) and c.status="待审批" `
 		joinCondition = " and a.curr_node_id!=d.node_id"
+		pars = append(pars, sysUser.AdminId, sysUser.AdminId)
 	} else {
 		condition += ` AND (c.seller_id = ? or d.approve_user_id = ?)`
+		pars = append(pars, sysUser.AdminId, sysUser.AdminId)
 	}
-	pars = append(pars, sysUser.AdminId, sysUser.AdminId)
 
 	//合同类型、、更新时间、所选销售
 	//关键字：合同编号、客户名称，社会信用码

controllers/seal_approval.go

@@ -71,16 +71,18 @@ func (c *SealApprovalCommon) List() {
 	joinCondition := " and a.curr_node_id=d.node_id"
 	//归属
 	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 a.curr_node_id=d.node_id)) and d.status="待审批") or (d.approve_user_id = ? and a.curr_node_id > d.node_id and d.node_type="cc") )`
 		//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)`
-
+		joinCondition = ``
+		pars = append(pars, sysUser.AdminId, sysUser.AdminId, sysUser.AdminId)
 	} else if status == "处理中" {
-		condition += ` AND ((c.user_id = ? and a.start_node_id != a.curr_node_id) OR (d.approve_user_id = ? )) and c.status="待审批" `
+		condition += ` AND ((c.user_id = ? and a.start_node_id != a.curr_node_id) OR (d.approve_user_id = ? and a.curr_node_id > d.node_id and d.node_type!="cc")) and c.status="待审批" `
 		joinCondition = " and a.curr_node_id!=d.node_id"
+		pars = append(pars, sysUser.AdminId, sysUser.AdminId)
 	} else {
 		condition += ` AND (c.user_id = ? or d.approve_user_id = ?)`
+		pars = append(pars, sysUser.AdminId, sysUser.AdminId)
 	}
-	pars = append(pars, sysUser.AdminId, sysUser.AdminId)
 
 	//合同类型、、更新时间、所选销售
 	//关键字：合同编号、客户名称，社会信用码