Merge remote-tracking branch 'origin/main'

ruoyi-kaohe/src/main/resources/mapper/kaohe/KhPingceMapper.xml

@@ -54,10 +54,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getBkhdxs"  resultMap="BkhdxsResult">
-        select pe.bkhdx_id,pe.bkhdx_name,pe.dept_id,pe.dept_name,emp.word_id,emp.`position` from kh_pc_emp pe,kh_employee emp
+        select pe.bkhdx_id,pe.bkhdx_name,pe.dept_id,pe.dept_name,emp.word_id,emp.`position` from kh_pc_emp pe left join kh_employee emp
+        on pe.bkhdx_id = emp.id
         <where>
             <if test="id != null ">  pe.pc_id = #{id}</if>
-            and pe.bkhdx_id = emp.id
         </where>
     </select>