Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

云

2026-06-17 8c0d4b8f762b1e1535379c604fdc8e2530dc6c8a

 src/main/resources/mapper/staff/SchemeApplicableStaffMapper.xml

@@ -25,6 +25,20 @@
        create_time DESC
    </select>

    <!-- 根据部门ID查询最新社保方案 -->
    <select id="selectLatestSchemeByDeptId" resultType="com.ruoyi.staff.pojo.SchemeApplicableStaff">
        SELECT
        <include refid="schemeColumns"/>
        FROM
        scheme_applicable_staff
        WHERE
        1 = 1
        AND FIND_IN_SET(#{deptId}, dept_ids)
        ORDER BY
        create_time DESC
        LIMIT 1
    </select>

    <!-- 查询方案对应的明细 -->
    <select id="selectDetailBySchemeId" resultType="com.ruoyi.staff.pojo.SchemeInsuranceDetail">
        SELECT