2025-09-22 wj 整体修改3

qianhe-ydsj/src/main/resources/mapper/SjZdscMapper.xml

@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
         <where>
             <if test="deptId != null ">and (a.dept_id = #{deptId} or  find_in_set(#{deptId},d.ancestors))</if>
             <if test="deptId != null ">and (a.dept_id = #{deptId} or  find_in_set(#{deptId},d.ancestors))</if>
             <if test="lx != null  and lx != ''"> and a.lx = #{lx}</if>
             <if test="lx != null  and lx != ''"> and a.lx = #{lx}</if>
-            <if test="zdmc != null  and zdmc != ''"> and a.zdmc = #{zdmc}</if>
+            <if test="zdmc != null  and zdmc != ''"> and a.zdmc like  concat('%', #{zdmc}, '%')</if>
             <if test="bb != null  and bb != ''"> and a.bb = #{bb}</if>
             <if test="bb != null  and bb != ''"> and a.bb = #{bb}</if>
             <if test="fjms != null  and fjms != ''"> and a.fjms = #{fjms}</if>
             <if test="fjms != null  and fjms != ''"> and a.fjms = #{fjms}</if>
             <if test="zt != null  and zt != ''"> and a.zt = #{zt}</if>
             <if test="zt != null  and zt != ''"> and a.zt = #{zt}</if>
@@ -139,19 +139,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select * from (
         select * from (
         <include refid="selectSjZdscVo"/>
         <include refid="selectSjZdscVo"/>
         where 1=1 and zt = '1' and gxqx = '仅自己' and a.create_by = #{nowUserName}
         where 1=1 and zt = '1' and gxqx = '仅自己' and a.create_by = #{nowUserName}
+        <if test="deptId != null ">and (a.dept_id = #{deptId} or  find_in_set(#{deptId}, d.ancestors))</if>
+        <if test="lx != null  and lx != ''"> and a.lx = #{lx}</if>
+        <if test="zdmc != null  and zdmc != ''"> and a.zdmc like concat('%', #{zdmc}, '%')</if>
+        <if test="deptName != null  and deptName != ''"> and d.dept_name like concat('%', #{deptName}, '%')</if>
 
 
         union
         union
         <include refid="selectSjZdscVo"/>
         <include refid="selectSjZdscVo"/>
         where 1=1 and zt = '1' and gxqx = '本单位' and a.dept_id = #{nowUserDeptId}
         where 1=1 and zt = '1' and gxqx = '本单位' and a.dept_id = #{nowUserDeptId}
+        <if test="deptId != null ">and (a.dept_id = #{deptId} or  find_in_set(#{deptId}, d.ancestors))</if>
+        <if test="lx != null  and lx != ''"> and a.lx = #{lx}</if>
+        <if test="zdmc != null  and zdmc != ''"> and a.zdmc like concat('%', #{zdmc}, '%')</if>
+        <if test="deptName != null  and deptName != ''"> and d.dept_name like concat('%', #{deptName}, '%')</if>
 
 
         union
         union
         <include refid="selectSjZdscVo"/>
         <include refid="selectSjZdscVo"/>
         where 1=1 and zt = '1' and gxqx = '仅上级' and (a.dept_id = #{nowUserDeptId} or find_in_set(#{nowUserDeptId}, d.ancestors))
         where 1=1 and zt = '1' and gxqx = '仅上级' and (a.dept_id = #{nowUserDeptId} or find_in_set(#{nowUserDeptId}, d.ancestors))
+        <if test="deptId != null ">and (a.dept_id = #{deptId} or  find_in_set(#{deptId}, d.ancestors))</if>
+        <if test="lx != null  and lx != ''"> and a.lx = #{lx}</if>
+        <if test="zdmc != null  and zdmc != ''"> and a.zdmc like concat('%', #{zdmc}, '%')</if>
+        <if test="deptName != null  and deptName != ''"> and d.dept_name like concat('%', #{deptName}, '%')</if>
 
 
         union
         union
         <include refid="selectSjZdscVo"/>
         <include refid="selectSjZdscVo"/>
         where 1=1 and zt = '1' and gxqx = '公开'
         where 1=1 and zt = '1' and gxqx = '公开'
-        )
+        <if test="deptId != null ">and (a.dept_id = #{deptId} or  find_in_set(#{deptId}, d.ancestors))</if>
+        <if test="lx != null  and lx != ''"> and a.lx = #{lx}</if>
+        <if test="zdmc != null  and zdmc != ''"> and a.zdmc like concat('%', #{zdmc}, '%')</if>
+        <if test="deptName != null  and deptName != ''"> and d.dept_name like concat('%', #{deptName}, '%')</if>
+
+        ) t
     </select>
     </select>
     <select id="gxgkList" parameterType="SjZdsc" resultMap="SjZdscResult">
     <select id="gxgkList" parameterType="SjZdsc" resultMap="SjZdscResult">
         <include refid="selectSjZdscVo"/>
         <include refid="selectSjZdscVo"/>