Merge remote-tracking branch 'origin/master'

lin

2024-03-14 c4e2c196aad8af656d94bc47e9f1a80bc504b5d7

 src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml

@@ -92,6 +92,16 @@
        </where>
    </select>


    <select id="getCount" resultType="java.lang.Integer">
        SELECT count(1)
        FROM jczz_task_residence_permit_apply jtrpa
        WHERE jtrpa.jw_grid_code IN
              (SELECT jpag.jw_grid_code FROM jczz_police_affairs_grid jpag WHERE jpag.police_user_id like concat('%',${userId},'%') )
          AND jtrpa.`confirm_flag` = 1

    </select>

    <resultMap type="org.springblade.modules.task.dto.TaskResidencePermitApplyDTO"
               id="TaskResidencePermitApplyDTOResult">
        <result property="id" column="id"/>