fix some issues with use command
parent
49e1b2044a
commit
0c10ac9748
|
|
@ -5,7 +5,7 @@ pub struct FilterUses {
|
||||||
pub filter_module_no: String,
|
pub filter_module_no: String,
|
||||||
pub filter_user: usize,
|
pub filter_user: usize,
|
||||||
pub filter_id: usize,
|
pub filter_id: usize,
|
||||||
pub active: String,
|
pub active: usize,
|
||||||
pub merchant: String,
|
pub merchant: String,
|
||||||
pub ep_id: usize,
|
pub ep_id: usize,
|
||||||
pub ep_no: String,
|
pub ep_no: String,
|
||||||
|
|
|
||||||
|
|
@ -106,8 +106,7 @@ impl FilterRepo {
|
||||||
t3.ep_id,
|
t3.ep_id,
|
||||||
t4.m_name as merchant,
|
t4.m_name as merchant,
|
||||||
t2.filter_no,
|
t2.filter_no,
|
||||||
t3.ep_no,
|
t3.ep_no
|
||||||
t2.filter_is_active as active
|
|
||||||
FROM global_data.filter_modules t1
|
FROM global_data.filter_modules t1
|
||||||
JOIN filter t2 ON t1.filter_module_id = t2.filter_module_id
|
JOIN filter t2 ON t1.filter_module_id = t2.filter_module_id
|
||||||
JOIN exchange_point t3 ON t3.ep_id = t2.ep_id
|
JOIN exchange_point t3 ON t3.ep_id = t2.ep_id
|
||||||
|
|
@ -115,13 +114,13 @@ impl FilterRepo {
|
||||||
WHERE
|
WHERE
|
||||||
t4.is_deleted = 0
|
t4.is_deleted = 0
|
||||||
AND t2.is_deleted = 0
|
AND t2.is_deleted = 0
|
||||||
AND t1.file_name LIKE :search_like
|
AND (t1.file_name LIKE :search_like or t1.filter_module_id = :module_id)
|
||||||
",
|
",
|
||||||
)?;
|
)?;
|
||||||
|
|
||||||
let search_like = format!("%{}%", filter_file);
|
let search_like = format!("%{}%", filter_file);
|
||||||
|
|
||||||
let params = params! {"search_like" => search_like};
|
let params = params! {"search_like" => search_like, "module_id" => filter_file};
|
||||||
|
|
||||||
connection.exec_map(
|
connection.exec_map(
|
||||||
stat,
|
stat,
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@ impl FilterService {
|
||||||
println!("No use for file/module found!");
|
println!("No use for file/module found!");
|
||||||
} else {
|
} else {
|
||||||
uses.into_iter().for_each(|filter_use: FilterUses| {
|
uses.into_iter().for_each(|filter_use: FilterUses| {
|
||||||
let is_active = if filter_use.active.eq("1") {
|
let is_active = if filter_use.active == 1 {
|
||||||
"true".to_string()
|
"true".to_string()
|
||||||
} else {
|
} else {
|
||||||
"false".to_string()
|
"false".to_string()
|
||||||
|
|
@ -35,6 +35,7 @@ impl FilterService {
|
||||||
println!("ModuleNo: {}", filter_use.filter_module_no);
|
println!("ModuleNo: {}", filter_use.filter_module_no);
|
||||||
println!("FilterUser: {}", filter_use.filter_user);
|
println!("FilterUser: {}", filter_use.filter_user);
|
||||||
println!("Description: {}", filter_use.description);
|
println!("Description: {}", filter_use.description);
|
||||||
|
println!("EP_NO: {}", filter_use.ep_no);
|
||||||
println!("FilterId: {}", filter_use.filter_id);
|
println!("FilterId: {}", filter_use.filter_id);
|
||||||
println!("FilterNo: {}", filter_use.filter_no);
|
println!("FilterNo: {}", filter_use.filter_no);
|
||||||
println!("Merchant: {}", filter_use.merchant);
|
println!("Merchant: {}", filter_use.merchant);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue