diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsNavigationMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsNavigationMapper.xml
index 20903aa..93a4ae3 100644
--- a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsNavigationMapper.xml
+++ b/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsNavigationMapper.xml
@@ -7,7 +7,7 @@
         SELECT a.*, b.title as parentName, b.position as parentPosition, c.name as modelName
         FROM cms_navigation a
         LEFT JOIN cms_navigation b ON a.parent_id = b.navigation_id
-        LEFT JOIN cms_model c ON a.model = c.model
+        LEFT JOIN cms_model c ON a.model = c.model AND c.model = 0
         <where>
             <if test="param.navigationId != null">
                 AND a.navigation_id = #{param.navigationId}
diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditXgxfMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditXgxfMapper.xml
index afba995..d46d11a 100644
--- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditXgxfMapper.xml
+++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditXgxfMapper.xml
@@ -76,6 +76,10 @@
                 AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
                   OR b.name LIKE CONCAT('%', #{param.keywords}, '%')
                   OR a.case_number = #{param.keywords}
+                  OR a.plaintiff_appellant = #{param.keywords}
+                  OR a.appellee = #{param.keywords}
+                  OR a.court_name = #{param.keywords}
+                  OR a.other_parties_third_party LIKE CONCAT('%', #{param.keywords}, '%')
                 )
               </if>
         </where>