2025-12-03 wj 修改

qianhe-ydsj/src/main/resources/mapper/SjGfjsZsdwkhpjZbMapper.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.SjGfjsZsdwkhpjZbMapper">
 <mapper namespace="com.qianhe.mapper.SjGfjsZsdwkhpjZbMapper">
-    
+
     <resultMap type="SjGfjsZsdwkhpjZb" id="SjGfjsZsdwkhpjZbResult">
     <resultMap type="SjGfjsZsdwkhpjZb" id="SjGfjsZsdwkhpjZbResult">
         <result property="id"    column="id"    />
         <result property="id"    column="id"    />
         <result property="deptId"    column="dept_id"    />
         <result property="deptId"    column="dept_id"    />
@@ -97,8 +97,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                yl3,
                yl3,
                yl4,
                yl4,
                yl5,d.dept_name,p.dept_name parent_name, a.pm, a.zt,a.fdjb,
                yl5,d.dept_name,p.dept_name parent_name, a.pm, a.zt,a.fdjb,
-                ( select distinct pjqk from sj_nd_dwpjqk q
-                  WHERE q.dept_id = a.dept_id and q.nd = a.nd-1 order by nd desc limit 1 ) qnpjqk
+                ( select  pjqk from sj_nd_dwpjqk q
+                  WHERE q.dept_id = a.dept_id and q.nd = a.nd-1 order by q.nd desc limit 1 ) qnpjqk
         from sj_gfjs_zsdwkhpj_zb a
         from sj_gfjs_zsdwkhpj_zb a
                  left join sys_dept d on a.dept_id=d.dept_id
                  left join sys_dept d on a.dept_id=d.dept_id
                  left join sys_dept p on a.parent_dept_id=p.dept_id
                  left join sys_dept p on a.parent_dept_id=p.dept_id
@@ -106,7 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectSjGfjsZsdwkhpjZbList" parameterType="SjGfjsZsdwkhpjZb" resultMap="SjGfjsZsdwkhpjZbResult">
     <select id="selectSjGfjsZsdwkhpjZbList" parameterType="SjGfjsZsdwkhpjZb" resultMap="SjGfjsZsdwkhpjZbResult">
         <include refid="selectSjGfjsZsdwkhpjZbVo"/>
         <include refid="selectSjGfjsZsdwkhpjZbVo"/>
-        <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="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>
@@ -204,7 +204,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         </where>
         order by a.dept_id, p.order_num, a.pm,a.zhdf desc
         order by a.dept_id, p.order_num, a.pm,a.zhdf desc
     </select>
     </select>
-    
+
     <select id="selectSjGfjsZsdwkhpjZbById" parameterType="Long" resultMap="SjGfjsZsdwkhpjZbResult">
     <select id="selectSjGfjsZsdwkhpjZbById" parameterType="Long" resultMap="SjGfjsZsdwkhpjZbResult">
         <include refid="selectSjGfjsZsdwkhpjZbVo"/>
         <include refid="selectSjGfjsZsdwkhpjZbVo"/>
         where id = #{id}
         where id = #{id}
@@ -362,7 +362,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
     </delete>
 
 
     <delete id="deleteSjGfjsZsdwkhpjZbByIds" parameterType="String">
     <delete id="deleteSjGfjsZsdwkhpjZbByIds" parameterType="String">
-        delete from sj_gfjs_zsdwkhpj_zb where id in 
+        delete from sj_gfjs_zsdwkhpj_zb where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
             #{id}
         </foreach>
         </foreach>
@@ -417,4 +417,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         </where>
         order by p.order_num, a.pm,a.zhdf desc
         order by p.order_num, a.pm,a.zhdf desc
     </select>
     </select>
-</mapper>
+</mapper>
\ No newline at end of file