20230129_sun修正首页及信息查询机构向显示

ruoyi-modules/mz-organization-khgl/src/main/resources/mapper/organization/YljgKhJbxxMapper.xml

@@ -657,8 +657,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
         yljg_kh_jbxx FORCE INDEX (idx_rzjg)
         <where>
-            status = '0'
-            AND is_rz = '1'
+            is_rz = '1'
             AND create_user_type = '01'
             <if test="xm != null  and xm != ''"> and xm like concat('%', #{xm}, '%')</if>
             <if test="zjhm != null  and zjhm != ''"> and zjhm = #{zjhm}</if>
@@ -666,7 +665,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="xjdxzqy != null  and xjdxzqy != ''"> and xjdxzqy in (select code from sys_dept_jl where code = #{xjdxzqy} or find_in_set(#{xjdxzqy}, ancestors)) </if>
             <if test="jgId != null  and jgId != ''"> and jg_id = #{jgId}</if>
             <if test="(jgmc != null and jgmc != '') and (xzqhId != null  and xzqhId != '')">
-                AND jg_id IN (select id from yljg_jcxx where ssxzqh IN (
+                AND jg_id IN (select id from yljg_jcxx where sczt = '01' and ssxzqh IN (
                 SELECT
                 code
                 FROM
@@ -676,8 +675,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 OR find_in_set(#{xzqhId}, ancestors)
                 ) and jgmc like concat('%', #{jgmc}, '%'))
             </if>
-            <if test="(jgmc != null and jgmc != '') and (xzqhId == null or xzqhId == '')"> AND jg_id IN (select id from yljg_jcxx where jgmc like concat('%', #{jgmc}, '%'))</if>
-            <if test="(jgmc == null or jgmc == '') and (xzqhId != null and xzqhId != '')"> AND jg_id IN (select id from yljg_jcxx where ssxzqh IN (
+            <if test="(jgmc != null and jgmc != '') and (xzqhId == null or xzqhId == '')"> AND jg_id IN (select id from yljg_jcxx where sczt = '01' and jgmc like concat('%', #{jgmc}, '%'))</if>
+            <if test="(jgmc == null or jgmc == '') and (xzqhId != null and xzqhId != '')"> AND jg_id IN (select id from yljg_jcxx where sczt = '01' and ssxzqh IN (
                 SELECT
                 code
                 FROM
@@ -687,11 +686,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 OR find_in_set(#{xzqhId}, ancestors)
                 ))</if>
             <if test="nlpg != null  and nlpg != ''"> and nlpg = #{nlpg}</if>
-            <if test='isPresent == "1"'> AND jg_id IN (select id from yljg_jcxx where ssxzqh = #{xzqhId})</if>
+            <if test='isPresent == "1"'> AND jg_id IN (select id from yljg_jcxx where sczt = '01' and ssxzqh = #{xzqhId})</if>
             <if test="isCj != null  and isCj != ''"> and is_cj = #{isCj}</if>
-            <if test='isGbmb == "01"'> and jg_id in (select id from yljg_jcxx where dwxz in ('30','31','32','33','40','41','42','43')) </if>
-            <if test='isGbmb == "00"'> and jg_id in (select id from yljg_jcxx where dwxz in ('10','20','21','22','23')) </if>
-            <if test="isGbmy != null  and isGbmy != ''"> and jg_id in (select id from yljg_jcxx where is_gbmy = #{isGbmy})</if>
+            <if test='isGbmb == "01"'> and jg_id in (select id from yljg_jcxx where sczt = '01' and dwxz in ('30','31','32','33','40','41','42','43')) </if>
+            <if test='isGbmb == "00"'> and jg_id in (select id from yljg_jcxx where sczt = '01' and dwxz in ('10','20','21','22','23')) </if>
+            <if test="isGbmy != null  and isGbmy != ''"> and jg_id in (select id from yljg_jcxx where sczt = '01' and is_gbmy = #{isGbmy})</if>
         </where>
     </select>
 
@@ -701,14 +700,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
         yljg_kh_jbxx FORCE INDEX (idx_sqfw)
         <where>
-            status = '0'
-            AND create_user_type = '02'
+            create_user_type = '02'
             <if test="xm != null  and xm != ''"> and xm like concat('%', #{xm}, '%')</if>
             <if test="zjhm != null  and zjhm != ''"> and zjhm = #{zjhm}</if>
             <if test="xjdxzqy != null  and xjdxzqy != ''"> and xjdxzqy = #{xjdxzqy}</if>
             <if test="xjdxzqy != null  and xjdxzqy != ''"> and xjdxzqy in (select code from sys_dept_jl where code = #{xjdxzqy} or find_in_set(#{xjdxzqy}, ancestors)) </if>
             <if test="(jgmc != null and jgmc != '') and (xzqhId != null  and xzqhId != '')">
-                AND jg_id IN (select id from yljgsq_jcxx where ssxzqh IN (
+                AND jg_id IN (select id from yljgsq_jcxx where sczt = '01' and ssxzqh IN (
                 SELECT
                 code
                 FROM
@@ -718,8 +716,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 OR find_in_set(#{xzqhId}, ancestors)
                 ) and jgmc like concat('%', #{jgmc}, '%'))
             </if>
-            <if test="(jgmc != null and jgmc != '') and (xzqhId == null or xzqhId == '')"> AND jg_id IN (select id from yljgsq_jcxx where jgmc like concat('%', #{jgmc}, '%'))</if>
-            <if test="(jgmc == null or jgmc == '') and (xzqhId != null and xzqhId != '')"> AND jg_id IN (select id from yljgsq_jcxx where ssxzqh IN (
+            <if test="(jgmc != null and jgmc != '') and (xzqhId == null or xzqhId == '')"> AND jg_id IN (select id from yljgsq_jcxx where sczt = '01' and jgmc like concat('%', #{jgmc}, '%'))</if>
+            <if test="(jgmc == null or jgmc == '') and (xzqhId != null and xzqhId != '')"> AND jg_id IN (select id from yljgsq_jcxx where sczt = '01' and ssxzqh IN (
                 SELECT
                 code
                 FROM
@@ -729,7 +727,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 OR find_in_set(#{xzqhId}, ancestors)
                 ))</if>
             <if test="nlpg != null  and nlpg != ''"> and nlpg = #{nlpg}</if>
-            <if test='isPresent == "1"'> AND jg_id IN (select id from yljgsq_jcxx where ssxzqh = #{xzqhId})</if>
+            <if test='isPresent == "1"'> AND jg_id IN (select id from yljgsq_jcxx where sczt = '01' and ssxzqh = #{xzqhId})</if>
             <if test="isCj != null  and isCj != ''"> and is_cj = #{isCj}</if>
         </where>
     </select>
@@ -740,8 +738,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
         yljg_kh_jbxx FORCE INDEX (idx_rzjg)
         <where>
-            status = '0'
-            AND is_rz = '1'
+            is_rz = '1'
             AND create_user_type = '01'
             <if test="xm != null  and xm != ''"> and xm like concat('%', #{xm}, '%')</if>
             <if test="zjhm != null  and zjhm != ''"> and zjhm = #{zjhm}</if>
@@ -749,7 +746,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="xjdxzqy != null  and xjdxzqy != ''"> and xjdxzqy in (select code from sys_dept_jl where code = #{xjdxzqy} or find_in_set(#{xjdxzqy}, ancestors)) </if>
             <if test="jgId != null  and jgId != ''"> and jg_id = #{jgId}</if>
             <if test="(jgmc != null and jgmc != '') and (xzqhId != null  and xzqhId != '')">
-                AND jg_id IN (select id from yljg_jcxx where ssxzqh IN (
+                AND jg_id IN (select id from yljg_jcxx where sczt = '01' and ssxzqh IN (
                 SELECT
                 code
                 FROM
@@ -759,8 +756,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 OR find_in_set(#{xzqhId}, ancestors)
                 ) and jgmc like concat('%', #{jgmc}, '%'))
             </if>
-            <if test="(jgmc != null and jgmc != '') and (xzqhId == null or xzqhId == '')"> AND jg_id IN (select id from yljg_jcxx where jgmc like concat('%', #{jgmc}, '%'))</if>
-            <if test="(jgmc == null or jgmc == '') and (xzqhId != null and xzqhId != '')"> AND jg_id IN (select id from yljg_jcxx where ssxzqh IN (
+            <if test="(jgmc != null and jgmc != '') and (xzqhId == null or xzqhId == '')"> AND jg_id IN (select id from yljg_jcxx where sczt = '01' and jgmc like concat('%', #{jgmc}, '%'))</if>
+            <if test="(jgmc == null or jgmc == '') and (xzqhId != null and xzqhId != '')"> AND jg_id IN (select id from yljg_jcxx where sczt = '01' and ssxzqh IN (
                 SELECT
                 code
                 FROM
@@ -770,11 +767,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 OR find_in_set(#{xzqhId}, ancestors)
                 ))</if>
             <if test="nlpg != null  and nlpg != ''"> and nlpg = #{nlpg}</if>
-            <if test='isPresent == "1"'> AND jg_id IN (select id from yljg_jcxx where ssxzqh = #{xzqhId})</if>
+            <if test='isPresent == "1"'> AND jg_id IN (select id from yljg_jcxx where sczt = '01' and ssxzqh = #{xzqhId})</if>
             <if test="isCj != null  and isCj != ''"> and is_cj = #{isCj}</if>
-            <if test='isGbmb == "01"'> and jg_id in (select id from yljg_jcxx where dwxz in ('30','31','32','33','40','41','42','43')) </if>
-            <if test='isGbmb == "00"'> and jg_id in (select id from yljg_jcxx where dwxz in ('10','20','21','22','23')) </if>
-            <if test="isGbmy != null  and isGbmy != ''"> and jg_id in (select id from yljg_jcxx where is_gbmy = #{isGbmy})</if>
+            <if test='isGbmb == "01"'> and jg_id in (select id from yljg_jcxx where sczt = '01' and dwxz in ('30','31','32','33','40','41','42','43')) </if>
+            <if test='isGbmb == "00"'> and jg_id in (select id from yljg_jcxx where sczt = '01' and dwxz in ('10','20','21','22','23')) </if>
+            <if test="isGbmy != null  and isGbmy != ''"> and jg_id in (select id from yljg_jcxx where sczt = '01' and is_gbmy = #{isGbmy})</if>
         </where>
         LIMIT #{params.pageNum}, #{params.pageSize}
     </select>
@@ -785,14 +782,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
         yljg_kh_jbxx FORCE INDEX (idx_sqfw)
         <where>
-            status = '0'
-            AND create_user_type = '02'
+            create_user_type = '02'
             <if test="xm != null  and xm != ''"> and xm like concat('%', #{xm}, '%')</if>
             <if test="zjhm != null  and zjhm != ''"> and zjhm = #{zjhm}</if>
             <if test="xjdxzqy != null  and xjdxzqy != ''"> and xjdxzqy = #{xjdxzqy}</if>
             <if test="xjdxzqy != null  and xjdxzqy != ''"> and xjdxzqy in (select code from sys_dept_jl where code = #{xjdxzqy} or find_in_set(#{xjdxzqy}, ancestors)) </if>
             <if test="(jgmc != null and jgmc != '') and (xzqhId != null  and xzqhId != '')">
-                AND jg_id IN (select id from yljgsq_jcxx where ssxzqh IN (
+                AND jg_id IN (select id from yljgsq_jcxx where sczt = '01' and ssxzqh IN (
                 SELECT
                 code
                 FROM
@@ -802,8 +798,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 OR find_in_set(#{xzqhId}, ancestors)
                 ) and jgmc like concat('%', #{jgmc}, '%'))
             </if>
-            <if test="(jgmc != null and jgmc != '') and (xzqhId == null or xzqhId == '')"> AND jg_id IN (select id from yljgsq_jcxx where jgmc like concat('%', #{jgmc}, '%'))</if>
-            <if test="(jgmc == null or jgmc == '') and (xzqhId != null and xzqhId != '')"> AND jg_id IN (select id from yljgsq_jcxx where ssxzqh IN (
+            <if test="(jgmc != null and jgmc != '') and (xzqhId == null or xzqhId == '')"> AND jg_id IN (select id from yljgsq_jcxx where sczt = '01' and jgmc like concat('%', #{jgmc}, '%'))</if>
+            <if test="(jgmc == null or jgmc == '') and (xzqhId != null and xzqhId != '')"> AND jg_id IN (select id from yljgsq_jcxx where sczt = '01' and ssxzqh IN (
                 SELECT
                 code
                 FROM
@@ -813,7 +809,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 OR find_in_set(#{xzqhId}, ancestors)
                 ))</if>
             <if test="nlpg != null  and nlpg != ''"> and nlpg = #{nlpg}</if>
-            <if test='isPresent == "1"'> AND jg_id IN (select id from yljgsq_jcxx where ssxzqh = #{xzqhId})</if>
+            <if test='isPresent == "1"'> AND jg_id IN (select id from yljgsq_jcxx where sczt = '01' and ssxzqh = #{xzqhId})</if>
             <if test="isCj != null  and isCj != ''"> and is_cj = #{isCj}</if>
         </where>
         LIMIT #{params.pageNum}, #{params.pageSize}