Browse Source

fix:看板审批

zqbao 5 months ago
parent
commit
2efff2aa92
2 changed files with 2 additions and 2 deletions
  1. 1 1
      models/bi_approve/bi_approve_node.go
  2. 1 1
      models/bi_approve/bi_approve_record.go

+ 1 - 1
models/bi_approve/bi_approve_node.go

@@ -78,7 +78,7 @@ func GetBiApproveNodeByCondition(condition string, pars []interface{}) (node []*
 	o := global.DmSQL["rddp"]
 	sql := "SELECT * FROM bi_approve_node WHERE 1=1 "
 	if condition != "" {
-		sql += " AND " + condition
+		sql += condition
 	}
 	err = o.Raw(sql, pars...).Find(&node).Error
 	return

+ 1 - 1
models/bi_approve/bi_approve_record.go

@@ -120,7 +120,7 @@ func (b *BiApproveRecord) UpdateNodeState(biApproveId, nodeId, nodeState, nodeAp
 
 	// 更新条件
 	whereParas := []interface{}{biApproveId, nodeId}
-	pars = append(pars, whereParas)
+	pars = append(pars, whereParas...)
 
 	sql := fmt.Sprintf(`UPDATE %s SET node_state=?,node_approve_user_id=?,node_approve_user_name=?,node_approve_time=? WHERE bi_approve_id = ? AND node_id = ?`, b.TableName())
 	err = global.DmSQL["rddp"].Exec(sql, pars...).Error