Merge remote-tracking branch 'origin/master'

sinake

2 天以前 49120f2b9db33455756a911e56cfefd7c3120a14

 ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml

@@ -70,6 +70,7 @@
        <result property="organchargedesc" column="organchargedesc"/>
        <result property="notgetreason" column="notgetreason"/>
        <result property="transplantstate" column="transplantstate"/>
        <result property="sort" column="sort"/>
    </resultMap>

    <sql id="selectServiceDonateorganVo">
@@ -77,6 +78,7 @@
               InfoID,
               DonorNo,
               OrganNo,
               sort,
               OrganName,
               OrganState,
               OrganNumber,
@@ -149,6 +151,7 @@
        <include refid="selectServiceDonateorganVo"/>
        <where>
            <if test="infoid != null ">and InfoID = #{infoid}</if>
            <if test="sort != null ">and sort = #{sort}</if>
            <if test="donorno != null  and donorno != ''">and DonorNo = #{donorno}</if>
            <if test="organno != null  and organno != ''">and OrganNo = #{organno}</if>
            <if test="organname != null  and organname != ''">and OrganName like concat('%', #{organname}, '%')</if>
@@ -179,6 +182,8 @@
            <if test="isdgf != null ">and isDGF = #{isdgf}</if>

        </where>
        <!-- 2026-10-23：按器官排队序号排序（空的排最后，再按主键兜底） -->
        order by (sort is null or sort = 0), sort asc, ID asc
    </select>
    <select id="getAllDonateOrgans" resultType="com.ruoyi.project.domain.ServiceDonateorgan">
        <include refid="selectServiceDonateorganVo"/>
@@ -412,6 +417,7 @@
        `service_donatebaseinfo`.`ReportTime` AS `ReportTime`,
        `service_donatebaseinfo`.`RecordState` AS `RecordState`,
        `service_donateorgan`.`ID` AS `doID`,
        `service_donateorgan`.`sort` AS `sort`,
        `service_donateorgan`.`InfoID` AS `InfoID`,
        `service_donateorgan`.`DonorNo` AS `doDonorNo`,
        `service_donateorgan`.`OrganNo` AS `OrganNo`,