fix(menu): 解决菜单父ID为空时的空指针异常

- 在比较父菜单ID前添加非空检查
- 防止当菜单记录的parentId字段为null时发生NullPointerException
- 确保菜单树构建逻辑的稳定性

srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveAttachMapper.xml

@@ -46,7 +46,6 @@
         <result property="updateTime" column="update_time"/>
         <result property="affixId" column="affix_id"/>
         <result property="deployId"    column="deploy_id"    />
-        <result property="deptName"    column="dept_name"    />
         <!--入伍保留学籍申请表-审核记录 （多条件查询column里传入了多条件【{studentName = student_name, studentNo = student_no}】javaType里面写了list表明你有多条件 studentName student_name字段）-->
         <collection property="enlistmentReserveApprovalList"
                     column="{studentName = student_name, studentNo = student_no}"

srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveMapper.xml

@@ -29,7 +29,6 @@
         <result property="updateTime" column="update_time"/>
         <result property="affixId" column="affix_id"/>
         <result property="deployId" column="deploy_id"/>
-        <result property="deptName" column="dept_name"/>
         <!--入伍保留学籍申请表-审核记录 （多条件查询column里传入了多条件【{studentName = student_name, studentNo = student_no}】javaType里面写了list表明你有多条件 studentName student_name字段）-->
         <collection property="enlistmentReserveApprovalList"
                     column="{studentName = student_name, studentNo = student_no}"
@@ -126,8 +125,7 @@
                create_time,
                update_time,
                affix_id,
-               deploy_id,
-               dept_name
+               deploy_id
         from rt_enlistment_reserve
     </sql>
 
@@ -162,9 +160,7 @@
             <if test="approvalNo != null  and approvalNo != ''">and approval_no = #{approvalNo}</if>
             <if test="affixId != null  and affixId != ''">and affix_id = #{affixId}</if>
             <if test="deployId != null  and deployId != ''">and deploy_id = #{deployId}</if>
-            <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
         </where>
-        order by id desc
     </select>
 
     <select id="selectRtEnlistmentReserveById" parameterType="Long" resultMap="RtEnlistmentReserveResult">
@@ -192,14 +188,6 @@
         select * from rt_enlistment_reserve
     </select>
 
-
-    <!--    匹配reserve_no以"BLXJ(年份)"开头的记录-->
-    <select id="countByYear" resultType="int">
-        SELECT COUNT(*)
-        FROM rt_enlistment_reserve
-        WHERE reserve_no LIKE CONCAT('BLXJ(', #{year}, ')%')
-    </select>
-
     <!--  根据流程编号查询申请记录  -->
     <select id="selectRtEnlistmentReserveByProcessInstanceId" parameterType="String"
             resultMap="RtEnlistmentReserveResult">
@@ -243,7 +231,6 @@
             <if test="updateTime != null">update_time,</if>
             <if test="affixId != null">affix_id,</if>
             <if test="deployId != null">deploy_id,</if>
-            <if test="deptName != null">dept_name,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="applyNo != null and applyNo != ''">#{applyNo},</if>
@@ -269,7 +256,6 @@
             <if test="updateTime != null">#{updateTime},</if>
             <if test="affixId != null">#{affixId},</if>
             <if test="deployId != null">#{deployId},</if>
-            <if test="deptName != null">#{deptName},</if>
         </trim>
     </insert>
 
@@ -299,7 +285,6 @@
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="affixId != null">affix_id = #{affixId},</if>
             <if test="deployId != null">deploy_id = #{deployId},</if>
-            <if test="deptName != null">dept_name = #{deptName},</if>
         </trim>
         where id = #{id}
     </update>