fix 合同 用印列表合并状态数据，筛选条件为：其它

controllers/contract_approval.go

@@ -94,10 +94,9 @@ func (c *ContractApprovalCommon) List() {
 			condition += ` AND c.status in ("已审批","已驳回")  `
 		} else if status == "其它" {
 			if sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_SELLER || sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_GROUP || sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_FICC_SELLER || sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_FICC_GROUP {
-				condition += ` AND c.status in ("已撤回","已作废")  `
+				condition += ` AND c.status in ("已撤回","已作废","已解约")  `
 			} else {
-				condition += ` AND c.status = ? `
-				pars = append(pars, "已作废")
+				condition += ` AND c.status in ("已作废","已解约")  `
 			}
 		} else {
 			condition += ` AND c.status = ? `

controllers/seal_approval.go

@@ -79,6 +79,9 @@ func (c *SealApprovalCommon) List() {
 		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 if status == "其它" {
+		condition += ` AND ( (c.user_id = ? and c.status in ("已撤回","已作废") ) or (d.approve_user_id = ? and d.node_id <= a.curr_node_id and c.status = "已作废" ))`
+		pars = append(pars, sysUser.AdminId, sysUser.AdminId)
 	} else {
 		condition += ` AND (c.user_id = ? or (d.approve_user_id = ? and d.node_id <= a.curr_node_id))`
 		pars = append(pars, sysUser.AdminId, sysUser.AdminId)
@@ -102,7 +105,7 @@ func (c *SealApprovalCommon) List() {
 	if status != "" {
 		if status == "已审批" {
 			condition += ` AND c.status in ("已审批","已驳回")  `
-		} else {
+		} else if status != "其它" { //其它状态额外处理，这边不处理
 			condition += ` AND c.status = ? `
 			if status == "处理中" {
 				pars = append(pars, "待审批")