2025-09-29 wj 整体修改4

qianhe-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectDeptVo"/>
         <include refid="selectDeptVo"/>
         where d.del_flag = '0'
         where d.del_flag = '0'
 		<if test="deptId != null and deptId != 0">
 		<if test="deptId != null and deptId != 0">
-			AND dept_id = #{deptId}
+			AND ( dept_id = #{deptId} or find_in_set(#{deptId}, d.ancestors) )
 		</if>
 		</if>
         <if test="parentId != null and parentId != 0">
         <if test="parentId != null and parentId != 0">
 			AND parent_id = #{parentId}
 			AND parent_id = #{parentId}
@@ -52,6 +52,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="dwjb != null and dwjb != ''">
 		<if test="dwjb != null and dwjb != ''">
 			AND d.dwjb &lt;= #{dwjb}
 			AND d.dwjb &lt;= #{dwjb}
 		</if>
 		</if>
+        <if test="deptYwfl != null and deptYwfl != ''">
+            AND dept_ywfl like concat('%', #{deptYwfl}, '%')
+        </if>
+        <if test="deptDfl != null and deptDfl != ''">
+            AND dept_dfl like concat('%', #{deptDfl}, '%')
+        </if>
+        <if test="deptLx != null and deptLx != ''">
+            AND dept_lx like concat('%', #{deptLx}, '%')
+        </if>
 		<!-- 数据范围过滤 -->
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 		${params.dataScope}
 		order by d.parent_id, d.order_num
 		order by d.parent_id, d.order_num

qianhe-ydsj/src/main/java/com/qianhe/service/impl/SjBzxxServiceImpl.java

@@ -136,7 +136,10 @@ public class SjBzxxServiceImpl implements ISjBzxxService
     @DataScope(deptAlias = "d")
     @DataScope(deptAlias = "d")
     public List<SjBzxx> dwbzrstjList(SjBzxx sjBzxx)
     public List<SjBzxx> dwbzrstjList(SjBzxx sjBzxx)
     {
     {
-        List<SysDept> deptList = sysDeptMapper.selectDeptList(new SysDept());
+        SysDept s_in = new SysDept();
+        s_in.setDeptId(sjBzxx.getDeptId());
+        s_in.setDeptYwfl(sjBzxx.getZsdwfl());
+        List<SysDept> deptList = sysDeptMapper.selectDeptList(s_in);
         List<SjBzxx> bzs = sjBzxxMapper.selectSjBzxxList(new SjBzxx());//班组
         List<SjBzxx> bzs = sjBzxxMapper.selectSjBzxxList(new SjBzxx());//班组
         List<SysDeptCb> cbs = sysDeptCbService.selectSysDeptCbList(new SysDeptCb());//单位从表
         List<SysDeptCb> cbs = sysDeptCbService.selectSysDeptCbList(new SysDeptCb());//单位从表