|
|
@@ -69,11 +69,12 @@
|
|
|
<!-- 分页查询 -->
|
|
|
<select id="queryPage" resultMap="ChargeType" parameterType="map">
|
|
|
SELECT ct.*,s.id_ subject_id_,s.name_ subject_name_
|
|
|
- FROM (SELECT * FROM charge_type WHERE del_flag_ = 0 <include refid="global.limit"/>) ct
|
|
|
+ FROM charge_type ct
|
|
|
LEFT JOIN charge_type_subject_mapper ctsm ON ct.id_ = ctsm.charge_type_id_
|
|
|
LEFT JOIN `subject` s ON ctsm.subject_id_ = s.id_
|
|
|
- where ct.tenant_id_ = #{tenantId}
|
|
|
+ where ct.tenant_id_ = #{tenantId} and ct.del_flag_ = 0
|
|
|
ORDER BY ct.update_time_
|
|
|
+ <include refid="global.limit"/>
|
|
|
</select>
|
|
|
|
|
|
<!-- 查询当前表的总记录数 -->
|
yonge