|
@@ -497,7 +497,7 @@ public class FinanceQueryDaoImpl implements FinanceQueryDao {
|
|
|
|
|
|
selSql.append(" from fx_merchant t ");
|
|
selSql.append(" from fx_merchant t ");
|
|
selSql.append(" LEFT JOIN tb_lib_join j on t.lib_id=j.id ");
|
|
selSql.append(" LEFT JOIN tb_lib_join j on t.lib_id=j.id ");
|
|
- selSql.append(" where t.`status`!=4 and t.sign_type in (1,2,3) and t.type in (1,2,5) ");
|
|
|
|
|
|
+ selSql.append(" where t.`status`!=4 and t.sign_type>=1 and t.type in (1,2,5) ");
|
|
if(!StringUtil.isEmpty(params.get("unitName"))){
|
|
if(!StringUtil.isEmpty(params.get("unitName"))){
|
|
selSql.append(" AND (t.unit_name LIKE concat('%',?,'%') OR j.league_name LIKE concat('%',?,'%') ) ");
|
|
selSql.append(" AND (t.unit_name LIKE concat('%',?,'%') OR j.league_name LIKE concat('%',?,'%') ) ");
|
|
queryParams.add(params.get("unitName"));
|
|
queryParams.add(params.get("unitName"));
|