2025-12-12 wj 修改

qianhe-ydsj/src/main/resources/mapper/system/SjGfjsXjbzMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.qianhe.mapper.SjGfjsXjbzMapper">
 <mapper namespace="com.qianhe.mapper.SjGfjsXjbzMapper">
-    
+
     <resultMap type="SjGfjsXjbz" id="SjGfjsXjbzResult">
     <resultMap type="SjGfjsXjbz" id="SjGfjsXjbzResult">
         <result property="id"    column="id"    />
         <result property="id"    column="id"    />
         <result property="bzId"    column="bz_id"    />
         <result property="bzId"    column="bz_id"    />
@@ -41,9 +41,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectSjGfjsXjbzList" parameterType="SjGfjsXjbz" resultMap="SjGfjsXjbzResult">
     <select id="selectSjGfjsXjbzList" parameterType="SjGfjsXjbz" resultMap="SjGfjsXjbzResult">
         <include refid="selectSjGfjsXjbzVo"/>
         <include refid="selectSjGfjsXjbzVo"/>
-        <where>  
+        <where>
             <if test="bzId != null "> and a.bz_id = #{bzId}</if>
             <if test="bzId != null "> and a.bz_id = #{bzId}</if>
-            <if test="deptId != null "> and a.dept_id = #{deptId}</if>
+            <if test="deptId != null "> and (a.dept_id = #{deptId} or  find_in_set(#{deptId},d.ancestors))</if>
             <if test="parentDeptId != null "> and a.parent_dept_id = #{parentDeptId}</if>
             <if test="parentDeptId != null "> and a.parent_dept_id = #{parentDeptId}</if>
             <if test="nd != null  and nd != ''"> and a.nd = #{nd}</if>
             <if test="nd != null  and nd != ''"> and a.nd = #{nd}</if>
             <if test="bzlx != null  and bzlx != ''"> and a.bzlx = #{bzlx}</if>
             <if test="bzlx != null  and bzlx != ''"> and a.bzlx = #{bzlx}</if>
@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectSjGfjsXjbzVo"/>
         <include refid="selectSjGfjsXjbzVo"/>
         where a.id = #{id}
         where a.id = #{id}
     </select>
     </select>
-        
+
     <insert id="insertSjGfjsXjbz" parameterType="SjGfjsXjbz" useGeneratedKeys="true" keyProperty="id">
     <insert id="insertSjGfjsXjbz" parameterType="SjGfjsXjbz" useGeneratedKeys="true" keyProperty="id">
         insert into sj_gfjs_xjbz
         insert into sj_gfjs_xjbz
         <trim prefix="(" suffix=")" suffixOverrides=",">
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -126,7 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         delete from sj_gfjs_xjbz where id = #{id}
         delete from sj_gfjs_xjbz where id = #{id}
     </delete>
     </delete>
     <delete id="deleteSjGfjsXjbzByIds" parameterType="String">
     <delete id="deleteSjGfjsXjbzByIds" parameterType="String">
-        delete from sj_gfjs_xjbz where id in 
+        delete from sj_gfjs_xjbz where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
             #{id}
         </foreach>
         </foreach>
@@ -174,4 +174,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
         </trim>
         where FIND_IN_SET(id, #{ids})
         where FIND_IN_SET(id, #{ids})
     </update>
     </update>
-</mapper>
+</mapper>
\ No newline at end of file