Merge branch 'driver'
This commit is contained in:
commit
2f1d91beff
@ -56,7 +56,7 @@
|
||||
order by studentTotalNum desc
|
||||
</select>
|
||||
|
||||
<select id="getCoachByUniqueCode" parameterType="String" resultType="cn.iocoder.yudao.module.base.entity.DlDriveSchoolCoach">
|
||||
<select id="getCoachByUniqueCode" parameterType="string" resultType="cn.iocoder.yudao.module.base.entity.DlDriveSchoolCoach">
|
||||
SELECT dsc.* FROM company_staff cs
|
||||
LEFT JOIN drive_school_coach dsc ON cs.user_id = dsc.user_id
|
||||
WHERE cs.unique_code = #{uniqueCode} AND dsc.DELETED = 0
|
||||
|
@ -56,7 +56,7 @@
|
||||
AND main.discount > 0
|
||||
</when>
|
||||
<when test="entity.discountIndex == 0">
|
||||
AND main.discount = 0 or main.discount is null
|
||||
AND (main.discount = 0 or main.discount IS NULL)
|
||||
</when>
|
||||
</choose>
|
||||
</if>
|
||||
|
Loading…
Reference in New Issue
Block a user