|
@@ -696,22 +696,19 @@
|
|
<if test="(baseLibType!=null) or (baseLibName!=null and baseLibName!='')">
|
|
<if test="(baseLibType!=null) or (baseLibName!=null and baseLibName!='')">
|
|
INNER JOIN
|
|
INNER JOIN
|
|
(SELECT
|
|
(SELECT
|
|
- t1.id AS ruleId,
|
|
|
|
|
|
+ t2.rule_id AS ruleId,
|
|
t3.id AS ruleBaseId,
|
|
t3.id AS ruleBaseId,
|
|
t5.lib_name AS baseLibName,
|
|
t5.lib_name AS baseLibName,
|
|
t5.lib_type AS baseLibType,
|
|
t5.lib_type AS baseLibType,
|
|
t3.type AS baseType
|
|
t3.type AS baseType
|
|
FROM
|
|
FROM
|
|
- kl_rule_search t1,
|
|
|
|
kl_rule_condition t2,
|
|
kl_rule_condition t2,
|
|
kl_rule_base t3,
|
|
kl_rule_base t3,
|
|
kl_concept t5
|
|
kl_concept t5
|
|
WHERE
|
|
WHERE
|
|
t3.is_deleted = "N"
|
|
t3.is_deleted = "N"
|
|
AND t5.is_deleted = "N"
|
|
AND t5.is_deleted = "N"
|
|
- AND t1.is_deleted = "N"
|
|
|
|
AND t2.is_deleted = "N"
|
|
AND t2.is_deleted = "N"
|
|
- AND t1.id = t2.rule_id
|
|
|
|
AND t2.rule_base_id = t3.id
|
|
AND t2.rule_base_id = t3.id
|
|
AND t3. STATUS = 1
|
|
AND t3. STATUS = 1
|
|
AND t5. STATUS = 1
|
|
AND t5. STATUS = 1
|
|
@@ -726,13 +723,12 @@
|
|
OR t5.lib_type= 410)
|
|
OR t5.lib_type= 410)
|
|
UNION ALL
|
|
UNION ALL
|
|
SELECT
|
|
SELECT
|
|
- t1.id AS ruleId,
|
|
|
|
|
|
+ t2.rule_id AS ruleId,
|
|
t3.id AS ruleBaseId,
|
|
t3.id AS ruleBaseId,
|
|
t11.lib_name AS baseLibName,
|
|
t11.lib_name AS baseLibName,
|
|
t11.lib_type AS baseLibType,
|
|
t11.lib_type AS baseLibType,
|
|
t3.type AS baseType
|
|
t3.type AS baseType
|
|
FROM
|
|
FROM
|
|
- kl_rule_search t1,
|
|
|
|
kl_rule_condition t2,
|
|
kl_rule_condition t2,
|
|
kl_rule_base t3,
|
|
kl_rule_base t3,
|
|
kl_concept t5,
|
|
kl_concept t5,
|
|
@@ -741,9 +737,7 @@
|
|
WHERE
|
|
WHERE
|
|
t3.is_deleted = "N"
|
|
t3.is_deleted = "N"
|
|
AND t5.is_deleted = "N"
|
|
AND t5.is_deleted = "N"
|
|
- AND t1.is_deleted = "N"
|
|
|
|
AND t2.is_deleted = "N"
|
|
AND t2.is_deleted = "N"
|
|
- AND t1.id = t2.rule_id
|
|
|
|
AND t2.rule_base_id = t3.id
|
|
AND t2.rule_base_id = t3.id
|
|
AND t3. STATUS = 1
|
|
AND t3. STATUS = 1
|
|
AND t5. STATUS = 1
|
|
AND t5. STATUS = 1
|